[src/trunk]: src/sys/arch/arm/arm32 splx: Restore interrupts before dosoftint...

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

details:   https://anonhg.NetBSD.org/src/rev/3194d05ac46a
branches:  trunk
changeset: 989069:3194d05ac46a
user:      rin <rin%NetBSD.org@localhost>
date:      Mon Oct 11 07:26:17 2021 +0000

description:
splx: Restore interrupts before dosoftints() for __HAVE_FAST_SOFTINTS.

No functional changes; All the users of arm32/spl.S, i.e., acorn32,
hpcarm/sa11x0, and shark have not switched to __HAVE_FAST_SOFTINTS yet.

diffstat:

 sys/arch/arm/arm32/spl.S |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 6903ec38968d -r 3194d05ac46a sys/arch/arm/arm32/spl.S
--- a/sys/arch/arm/arm32/spl.S  Mon Oct 11 07:19:37 2021 +0000
+++ b/sys/arch/arm/arm32/spl.S  Mon Oct 11 07:26:17 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spl.S,v 1.10 2013/12/02 18:36:10 joerg Exp $   */
+/*     $NetBSD: spl.S,v 1.11 2021/10/11 07:26:17 rin Exp $     */
 
 /*
  * Copyright (c) 1996-1998 Mark Brinicombe.
@@ -43,7 +43,7 @@
 #include <arm/locore.h>
 #include <arm/arm32/psl.h>
 
-       RCSID("$NetBSD: spl.S,v 1.10 2013/12/02 18:36:10 joerg Exp $")
+       RCSID("$NetBSD: spl.S,v 1.11 2021/10/11 07:26:17 rin Exp $")
 
        .text
        .align  0
@@ -111,8 +111,8 @@
        str     r3, [r1, #CI_CPL]       /* Store the new spl level */
 
        bl      _C_LABEL(irq_setmasks)  /* Update the actual masks */
+       msr     cpsr_c, r4
 #ifdef __HAVE_FAST_SOFTINTS
        bl      _C_LABEL(dosoftints)    /* Process any pending soft ints */
 #endif
-       msr     cpsr_c, r4
        ldmfd   sp!, {r0, r1, r4, pc}