[src/trunk]: src/sys/arch/powerpc/ibm4xx Reenable interrupt before was call p...

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

details:   https://anonhg.NetBSD.org/src/rev/05c332535a8d
branches:  trunk
changeset: 772576:05c332535a8d
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Mon Jan 09 06:25:55 2012 +0000

description:
Reenable interrupt before was call pic_do_pending_int() by splx(), or KASSERT().

diffstat:

 sys/arch/powerpc/ibm4xx/clock.c |  21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 3288382810ca -r 05c332535a8d sys/arch/powerpc/ibm4xx/clock.c
--- a/sys/arch/powerpc/ibm4xx/clock.c   Mon Jan 09 04:55:35 2012 +0000
+++ b/sys/arch/powerpc/ibm4xx/clock.c   Mon Jan 09 06:25:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.26 2011/06/20 17:44:33 matt Exp $  */
+/*     $NetBSD: clock.c,v 1.27 2012/01/09 06:25:55 kiyohara Exp $      */
 /*      $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $  */
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.26 2011/06/20 17:44:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.27 2012/01/09 06:25:55 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -98,6 +98,12 @@
 
        /* Nobody can interrupt us, but see if we're allowed to run. */
        int s = splclock();
+
+       /*
+        * Reenable interrupts
+        */
+       __asm volatile ("wrteei 1");
+
        if (IPL_CLOCK > s)
                statclock(frame);
        splx(s);
@@ -128,6 +134,12 @@
        ci->ci_data.cpu_nintr++;
        ci->ci_ev_clock.ev_count++;
        pcpl = splclock();
+
+       /*
+        * Reenable interrupts
+        */
+       __asm volatile ("wrteei 1");
+
        if (pcpl >= IPL_CLOCK) {
                tickspending += nticks;
                ticksmissed += nticks;
@@ -142,11 +154,6 @@
                lasttb = lasttb2;
 
                /*
-                * Reenable interrupts
-                */
-               __asm volatile ("wrteei 1");
-
-               /*
                 * Do standard timer interrupt stuff.
                 * Do softclock stuff only on the last iteration.
                 */