Module Name: src
Committed By: matt
Date: Wed Apr 16 22:44:43 UTC 2014
Modified Files:
src/sys/arch/arm/pic: pic_splfuncs.c
Log Message:
Do softints after restoring interrupts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/pic/pic_splfuncs.c
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/pic/pic_splfuncs.c
diff -u src/sys/arch/arm/pic/pic_splfuncs.c:1.4 src/sys/arch/arm/pic/pic_splfuncs.c:1.5
--- src/sys/arch/arm/pic/pic_splfuncs.c:1.4 Sat Sep 1 00:00:42 2012
+++ src/sys/arch/arm/pic/pic_splfuncs.c Wed Apr 16 22:44:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_splfuncs.c,v 1.4 2012/09/01 00:00:42 matt Exp $ */
+/* $NetBSD: pic_splfuncs.c,v 1.5 2014/04/16 22:44:42 matt 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.4 2012/09/01 00:00:42 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.5 2014/04/16 22:44:42 matt Exp $");
#define _INTR_PRIVATE
#include <sys/param.h>
@@ -93,12 +93,9 @@ splx(int savedipl)
ci->ci_intr_depth--;
KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
ci->ci_cpl, savedipl);
- cpu_dosoftints();
- KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
- ci->ci_cpl, savedipl);
if ((psw & I32_bit) == 0)
cpsie(I32_bit);
-
+ cpu_dosoftints();
KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
ci->ci_cpl, savedipl);
}
