Module Name: src
Committed By: jakllsch
Date: Sat May 28 20:56:37 UTC 2011
Modified Files:
src/sys/arch/arm/pic: pic_splfuncs.c
Log Message:
Restore ci_intr_depth increment for duration of pic_do_pending_ints() lost
when this code was moved.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 src/sys/arch/arm/pic/pic_splfuncs.c:1.2
--- src/sys/arch/arm/pic/pic_splfuncs.c:1.1 Fri Mar 11 03:16:14 2011
+++ src/sys/arch/arm/pic/pic_splfuncs.c Sat May 28 20:56:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_splfuncs.c,v 1.1 2011/03/11 03:16:14 bsh Exp $ */
+/* $NetBSD: pic_splfuncs.c,v 1.2 2011/05/28 20:56:37 jakllsch 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.1 2011/03/11 03:16:14 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.2 2011/05/28 20:56:37 jakllsch Exp $");
#define _INTR_PRIVATE
#include <sys/param.h>
@@ -63,7 +63,9 @@
KASSERT(panicstr || newipl <= ci->ci_cpl);
if (newipl < ci->ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
+ ci->ci_intr_depth++;
pic_do_pending_ints(psw, newipl, NULL);
+ ci->ci_intr_depth--;
restore_interrupts(psw);
}
return oldipl;
@@ -76,7 +78,9 @@
KASSERT(savedipl < NIPL);
if (savedipl < ci->ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
+ ci->ci_intr_depth++;
pic_do_pending_ints(psw, savedipl, NULL);
+ ci->ci_intr_depth--;
restore_interrupts(psw);
}
ci->ci_cpl = savedipl;
