[src/trunk]: src/sys/arch/arm/pic Restore ci_intr_depth increment for duratio...

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

details:   https://anonhg.NetBSD.org/src/rev/e336dc012797
branches:  trunk
changeset: 765503:e336dc012797
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat May 28 20:56:37 2011 +0000

description:
Restore ci_intr_depth increment for duration of pic_do_pending_ints() lost
when this code was moved.

diffstat:

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

diffs (38 lines):

diff -r 91795bf3e1d3 -r e336dc012797 sys/arch/arm/pic/pic_splfuncs.c
--- a/sys/arch/arm/pic/pic_splfuncs.c   Sat May 28 20:53:57 2011 +0000
+++ b/sys/arch/arm/pic/pic_splfuncs.c   Sat May 28 20:56:37 2011 +0000
@@ -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;