Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/booke Do not panic when splraise to IPL_NON...



details:   https://anonhg.NetBSD.org/src/rev/769733a77d14
branches:  trunk
changeset: 935523:769733a77d14
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Jul 04 17:20:45 2020 +0000

description:
Do not panic when splraise to IPL_NONE, which is required for
subr_cprng.c rev 1.36 and above:

http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/subr_cprng.c#rev1.36

diffstat:

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

diffs (38 lines):

diff -r e7c179240c47 -r 769733a77d14 sys/arch/powerpc/booke/e500_intr.c
--- a/sys/arch/powerpc/booke/e500_intr.c        Sat Jul 04 17:10:33 2020 +0000
+++ b/sys/arch/powerpc/booke/e500_intr.c        Sat Jul 04 17:20:45 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: e500_intr.c,v 1.40 2019/12/01 15:34:45 ad Exp $        */
+/*     $NetBSD: e500_intr.c,v 1.41 2020/07/04 17:20:45 rin Exp $       */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
 #define __INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.40 2019/12/01 15:34:45 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.41 2020/07/04 17:20:45 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -599,15 +599,16 @@
                        msr = 0;
 #endif
                wrtee(msr);
-       } else if (ipl == IPL_NONE) {
+       }
+#if 0
+       else if (ipl == IPL_NONE) {
                panic("%s: %p: cpl=%u: attempt to splraise(IPL_NONE)",
                    __func__, __builtin_return_address(0), old_ipl);
-#if 0
        } else if (old_ipl > ipl) {
                printf("%s: %p: cpl=%u: ignoring splraise(%u) to lower ipl\n",
                    __func__, __builtin_return_address(0), old_ipl, ipl);
+       }
 #endif
-       }
 
        return old_ipl;
 }



Home | Main Index | Thread Index | Old Index