From e89698aaabeb82a7af6d481075574139d2fa0921 Mon Sep 17 00:00:00 2001 From: rin Date: Sat, 4 Jul 2020 17:20:45 +0000 Subject: [PATCH] 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 --- sys/arch/powerpc/booke/e500_intr.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/arch/powerpc/booke/e500_intr.c b/sys/arch/powerpc/booke/e500_intr.c index c6c123d9f05c..6b2888ddc446 100644 --- a/sys/arch/powerpc/booke/e500_intr.c +++ b/sys/arch/powerpc/booke/e500_intr.c @@ -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 -__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 #include @@ -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; }