[src/netbsd-6]: src/sys/arch/hp700/hp700 Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/cce4849eb217
branches:  netbsd-6
changeset: 773967:cce4849eb217
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Apr 03 15:34:42 2012 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #148):
        sys/arch/hp700/hp700/intr.c: revision 1.38
Check for HPPA_SID_KERNEL when checking for interrupt in the
mutex_enter critical section.

diffstat:

 sys/arch/hp700/hp700/intr.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 0e199ee0b024 -r cce4849eb217 sys/arch/hp700/hp700/intr.c
--- a/sys/arch/hp700/hp700/intr.c       Mon Apr 02 18:31:13 2012 +0000
+++ b/sys/arch/hp700/hp700/intr.c       Tue Apr 03 15:34:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.36 2011/02/04 14:51:02 skrll Exp $  */
+/*     $NetBSD: intr.c,v 1.36.10.1 2012/04/03 15:34:42 riz Exp $       */
 /*     $OpenBSD: intr.c,v 1.27 2009/12/31 12:52:35 jsing Exp $ */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.36 2011/02/04 14:51:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.36.10.1 2012/04/03 15:34:42 riz Exp $");
 
 #define __MUTEX_PRIVATE
 
@@ -391,7 +391,8 @@
         * interrupt handlers need to aquire the mutex, they could deadlock if
         * the owner value is left unset.
         */
-       if (frame->tf_iioq_head >= (u_int)mutex_enter_crit_start &&
+       if (frame->tf_iisq_head == HPPA_SID_KERNEL &&
+           frame->tf_iioq_head >= (u_int)mutex_enter_crit_start &&
            frame->tf_iioq_head <= (u_int)mutex_enter_crit_end &&
            frame->tf_ret0 != 0)
                ((kmutex_t *)frame->tf_arg0)->mtx_owner = (uintptr_t)curlwp;