[src/trunk]: src/sys/arch/hppa/hppa Tweak astpending handling.

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

details:   https://anonhg.NetBSD.org/src/rev/acbaa1cfabd9
branches:  trunk
changeset: 750839:acbaa1cfabd9
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jan 16 13:29:47 2010 +0000

description:
Tweak astpending handling.

diffstat:

 sys/arch/hppa/hppa/hppa_machdep.c |  14 +++++++++-----
 sys/arch/hppa/hppa/trap.c         |  11 +++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r f236752acd7b -r acbaa1cfabd9 sys/arch/hppa/hppa/hppa_machdep.c
--- a/sys/arch/hppa/hppa/hppa_machdep.c Sat Jan 16 10:37:51 2010 +0000
+++ b/sys/arch/hppa/hppa/hppa_machdep.c Sat Jan 16 13:29:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hppa_machdep.c,v 1.18 2009/11/21 15:36:33 rmind Exp $  */
+/*     $NetBSD: hppa_machdep.c,v 1.19 2010/01/16 13:29:47 skrll Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.18 2009/11/21 15:36:33 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.19 2010/01/16 13:29:47 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -363,10 +363,14 @@
        if (ci->ci_want_resched && !immed)
                return;
        ci->ci_want_resched = 1;
+       /* setsoftast(ci->ci_data.cpu_onproc); */
+       setsoftast();
+
 #ifdef MULTIPROCESSOR
-        if (ci->ci_curlwp != ci->ci_data.cpu_idlelwp) {
-               /* aston(ci->ci_curlwp); */
-               setsoftast();
+       if (ci->ci_curlwp != ci->ci_data.cpu_idlelwp) {
+               if (immed && ci != curcpu()) {
+                       /* XXX send IPI */
+               }
        }
 #endif
 }
diff -r f236752acd7b -r acbaa1cfabd9 sys/arch/hppa/hppa/trap.c
--- a/sys/arch/hppa/hppa/trap.c Sat Jan 16 10:37:51 2010 +0000
+++ b/sys/arch/hppa/hppa/trap.c Sat Jan 16 13:29:47 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.69 2010/01/16 07:56:16 skrll Exp $  */
+/*     $NetBSD: trap.c,v 1.70 2010/01/16 13:29:47 skrll Exp $  */
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.69 2010/01/16 07:56:16 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.70 2010/01/16 13:29:47 skrll Exp $");
 
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
@@ -206,8 +206,11 @@
 {
        struct proc *p = l->l_proc;
 
-       if (curcpu()->ci_want_resched) {
-               preempt();
+       if (astpending) {
+               astpending = 0;
+               if (curcpu()->ci_want_resched) {
+                       preempt();
+               }
        }
 
        mi_userret(l);