[src/trunk]: src/sys/arch/arm/pic splx: restore priority even if interrupts a...

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

details:   https://anonhg.NetBSD.org/src/rev/f57a7ba8a207
branches:  trunk
changeset: 1018742:f57a7ba8a207
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Feb 15 16:04:01 2021 +0000

description:
splx: restore priority even if interrupts are disabled

diffstat:

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

diffs (27 lines):

diff -r 2fff83513274 -r f57a7ba8a207 sys/arch/arm/pic/pic_splfuncs.c
--- a/sys/arch/arm/pic/pic_splfuncs.c   Mon Feb 15 15:55:50 2021 +0000
+++ b/sys/arch/arm/pic/pic_splfuncs.c   Mon Feb 15 16:04:01 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic_splfuncs.c,v 1.10 2021/02/15 15:42:58 jmcneill Exp $       */
+/*     $NetBSD: pic_splfuncs.c,v 1.11 2021/02/15 16:04:01 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.10 2021/02/15 15:42:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.11 2021/02/15 16:04:01 jmcneill Exp $");
 
 #define _INTR_PRIVATE
 #include <sys/param.h>
@@ -99,6 +99,8 @@
 
                cpsie(I32_bit);
                cpu_dosoftints();
+       } else {
+               pic_set_priority(ci, savedipl);
        }
 
        KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",