Module Name: src
Committed By: rin
Date: Sat Jul 4 17:20:45 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/powerpc/booke/e500_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.40 src/sys/arch/powerpc/booke/e500_intr.c:1.41
--- src/sys/arch/powerpc/booke/e500_intr.c:1.40 Sun Dec 1 15:34:45 2019
+++ src/sys/arch/powerpc/booke/e500_intr.c Sat Jul 4 17:20:45 2020
@@ -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 @@ e500_splraise(int ipl)
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
}
+#endif
return old_ipl;
}
