From a774841e6c36ee16a6acc6263162abfa3bf7345c Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@NetBSD.org>
Date: Mon, 15 Feb 2021 16:04:01 +0000
Subject: [PATCH] splx: restore priority even if interrupts are disabled

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

diff --git a/sys/arch/arm/pic/pic_splfuncs.c b/sys/arch/arm/pic/pic_splfuncs.c
index 0719140293c8..05fc3f697916 100644
--- a/sys/arch/arm/pic/pic_splfuncs.c
+++ b/sys/arch/arm/pic/pic_splfuncs.c
@@ -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 @@ splx(int savedipl)
 
 		cpsie(I32_bit);
 		cpu_dosoftints();
+	} else {
+		pic_set_priority(ci, savedipl);
 	}
 
 	KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",