Module Name: src
Committed By: rin
Date: Mon Oct 11 07:26:17 UTC 2021
Modified Files:
src/sys/arch/arm/arm32: spl.S
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm32/spl.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/spl.S
diff -u src/sys/arch/arm/arm32/spl.S:1.10 src/sys/arch/arm/arm32/spl.S:1.11
--- src/sys/arch/arm/arm32/spl.S:1.10 Mon Dec 2 18:36:10 2013
+++ src/sys/arch/arm/arm32/spl.S Mon Oct 11 07:26:17 2021
@@ -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 @@ ENTRY(splx)
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}
