[src/trunk]: src/sys/arch/x86/x86 cpu_need_resched: make AST if no __HAVE_PRE...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d58c824900ef
branches:  trunk
changeset: 763492:d58c824900ef
user:      rmind <rmind%NetBSD.org@localhost>
date:      Mon Mar 21 22:25:13 2011 +0000

description:
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.

diffstat:

 sys/arch/x86/x86/x86_machdep.c |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (43 lines):

diff -r 344437faa117 -r d58c824900ef sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Mon Mar 21 20:39:32 2011 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Mon Mar 21 22:25:13 2011 +0000
@@ -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);
        }
 }