Module Name: src
Committed By: ad
Date: Mon Nov 25 17:24:59 UTC 2019
Modified Files:
src/sys/kern: kern_softint.c
Log Message:
port-sparc/54718 (sparc install hangs since recent scheduler changes)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/kern_softint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_softint.c
diff -u src/sys/kern/kern_softint.c:1.50 src/sys/kern/kern_softint.c:1.51
--- src/sys/kern/kern_softint.c:1.50 Sat Nov 23 19:42:52 2019
+++ src/sys/kern/kern_softint.c Mon Nov 25 17:24:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_softint.c,v 1.50 2019/11/23 19:42:52 ad Exp $ */
+/* $NetBSD: kern_softint.c,v 1.51 2019/11/25 17:24:59 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2019 The NetBSD Foundation, Inc.
@@ -170,7 +170,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.50 2019/11/23 19:42:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.51 2019/11/25 17:24:59 ad Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -689,14 +689,14 @@ softint_trigger(uintptr_t machdep)
struct cpu_info *ci;
lwp_t *l;
- l = curlwp;
- ci = l->l_cpu;
+ ci = curcpu();
ci->ci_data.cpu_softints |= machdep;
+ l = ci->ci_data.cpu_onproc;
if (l == ci->ci_data.cpu_idlelwp) {
atomic_or_uint(&ci->ci_want_resched, RESCHED_UPREEMPT);
} else {
/* MI equivalent of aston() */
- lwp_need_userret(l);
+ cpu_signotify(l);
}
}
