[src/trunk]: src/sys/arch/arm/pic Do softints after restoring interrupts

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

details:   https://anonhg.NetBSD.org/src/rev/611d6e38d82b
branches:  trunk
changeset: 328756:611d6e38d82b
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Apr 16 22:44:42 2014 +0000

description:
Do softints after restoring interrupts

diffstat:

 sys/arch/arm/pic/pic_splfuncs.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r 5ad19b083362 -r 611d6e38d82b sys/arch/arm/pic/pic_splfuncs.c
--- a/sys/arch/arm/pic/pic_splfuncs.c   Wed Apr 16 22:40:24 2014 +0000
+++ b/sys/arch/arm/pic/pic_splfuncs.c   Wed Apr 16 22:44:42 2014 +0000
@@ -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 @@
        ci->ci_intr_depth--;
        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);
-       if ((psw & I32_bit) == 0)
-               cpsie(I32_bit);
-
-       KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
-           ci->ci_cpl, savedipl);
 }