[src/netbsd-6]: src/sys/arch/powerpc/booke Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/e5aeb9c636d7
branches:  netbsd-6
changeset: 774323:e5aeb9c636d7
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Jul 12 17:15:17 2012 +0000

description:
Pull up following revision(s) (requested by matt in ticket #409):
        sys/arch/powerpc/booke/e500_intr.c: revision 1.18
If we paniced because a watchdog timed out, PSL_CE will be clear.  So don't
assert PSL_CE is set if panicstr is not NULL.

diffstat:

 sys/arch/powerpc/booke/e500_intr.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r f1a26f684222 -r e5aeb9c636d7 sys/arch/powerpc/booke/e500_intr.c
--- a/sys/arch/powerpc/booke/e500_intr.c        Thu Jul 12 17:11:17 2012 +0000
+++ b/sys/arch/powerpc/booke/e500_intr.c        Thu Jul 12 17:15:17 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: e500_intr.c,v 1.16.8.1 2012/06/13 19:41:28 riz Exp $   */
+/*     $NetBSD: e500_intr.c,v 1.16.8.2 2012/07/12 17:15:17 riz Exp $   */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -39,7 +39,7 @@
 #define __INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.16.8.1 2012/06/13 19:41:28 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.16.8.2 2012/07/12 17:15:17 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -491,7 +491,8 @@
        struct cpu_info * const ci = curcpu();
        const int old_ipl = ci->ci_cpl;
 
-       KASSERT(mfmsr() & PSL_CE);
+       /* if we paniced because of watchdog, PSL_CE will be clear.  */
+       KASSERT(panicstr != NULL || (mfmsr() & PSL_CE));
 
        if (ipl == old_ipl)
                return;
@@ -527,7 +528,8 @@
        struct cpu_info * const ci = curcpu();
        const int old_ipl = ci->ci_cpl;
 
-       KASSERT(mfmsr() & PSL_CE);
+       /* if we paniced because of watchdog, PSL_CE will be clear.  */
+       KASSERT(panicstr != NULL || (mfmsr() & PSL_CE));
 
        if (old_ipl < ipl) {
                //const
@@ -814,7 +816,8 @@
        struct cpu_softc * const cpu = ci->ci_softc;
        const int old_ipl = ci->ci_cpl;
 
-       KASSERT(mfmsr() & PSL_CE);
+       /* if we paniced because of watchdog, PSL_CE will be clear.  */
+       KASSERT(panicstr != NULL || (mfmsr() & PSL_CE));
 
 #if 0
 //     printf("%s(%p): idepth=%d enter\n", __func__, tf, ci->ci_idepth);