Module Name: src
Committed By: rmind
Date: Mon Mar 21 22:25:14 UTC 2011
Modified Files:
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
cpu_need_resched: make AST if no __HAVE_PREEMPTION. Change has no effect
since MP option is mandatory on x86, but makes code more logical.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/x86_machdep.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/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.45 src/sys/arch/x86/x86/x86_machdep.c:1.46
--- src/sys/arch/x86/x86/x86_machdep.c:1.45 Sun Feb 6 23:25:17 2011
+++ src/sys/arch/x86/x86/x86_machdep.c Mon Mar 21 22:25:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_machdep.c,v 1.45 2011/02/06 23:25:17 jmcneill Exp $ */
+/* $NetBSD: x86_machdep.c,v 1.46 2011/03/21 22:25:13 rmind Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.45 2011/02/06 23:25:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.46 2011/03/21 22:25:13 rmind Exp $");
#include "opt_modular.h"
#include "opt_physmem.h"
@@ -216,15 +216,16 @@
} else {
x86_send_ipi(ci, X86_IPI_KPREEMPT);
}
+ return;
#endif
- } else {
- aston(l, X86_AST_PREEMPT);
- if (ci == cur) {
- return;
- }
- if ((flags & RESCHED_IMMED) != 0) {
- x86_send_ipi(ci, 0);
- }
+ }
+
+ aston(l, X86_AST_PREEMPT);
+ if (ci == cur) {
+ return;
+ }
+ if ((flags & RESCHED_IMMED) != 0) {
+ x86_send_ipi(ci, 0);
}
}
