[src/trunk]: src/sys/arch/arm/pic splx: only dispatch softints if interrupts ...

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

details:   https://anonhg.NetBSD.org/src/rev/2c505f48469e
branches:  trunk
changeset: 959477:2c505f48469e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Feb 15 15:07:47 2021 +0000

description:
splx: only dispatch softints if interrupts are enabled

diffstat:

 sys/arch/arm/pic/pic_splfuncs.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r e6fe1fb36777 -r 2c505f48469e sys/arch/arm/pic/pic_splfuncs.c
--- a/sys/arch/arm/pic/pic_splfuncs.c   Mon Feb 15 14:38:06 2021 +0000
+++ b/sys/arch/arm/pic/pic_splfuncs.c   Mon Feb 15 15:07:47 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic_splfuncs.c,v 1.8 2018/04/01 04:35:04 ryo Exp $     */
+/*     $NetBSD: pic_splfuncs.c,v 1.9 2021/02/15 15:07:47 jmcneill Exp $        */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.8 2018/04/01 04:35:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.9 2021/02/15 15:07:47 jmcneill Exp $");
 
 #define _INTR_PRIVATE
 #include <sys/param.h>
@@ -95,9 +95,10 @@
        ci->ci_intr_depth--;
        KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
            ci->ci_cpl, savedipl);
-       if ((psw & I32_bit) == 0)
+       if ((psw & I32_bit) == 0) {
                cpsie(I32_bit);
-       cpu_dosoftints();
+               cpu_dosoftints();
+       }
        KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
            ci->ci_cpl, savedipl);
 }