[src/trunk]: src/sys/arch/powerpc/ibm4xx Move spl from ppc4xx_tlb_enter() to ...

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

details:   https://anonhg.NetBSD.org/src/rev/5710eff26f01
branches:  trunk
changeset: 772577:5710eff26f01
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Mon Jan 09 06:49:25 2012 +0000

description:
Move spl from ppc4xx_tlb_enter() to pmap_enter().  Don't call splx() on
I/DTLBMISS.

diffstat:

 sys/arch/powerpc/ibm4xx/pmap.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 05c332535a8d -r 5710eff26f01 sys/arch/powerpc/ibm4xx/pmap.c
--- a/sys/arch/powerpc/ibm4xx/pmap.c    Mon Jan 09 06:25:55 2012 +0000
+++ b/sys/arch/powerpc/ibm4xx/pmap.c    Mon Jan 09 06:49:25 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.70 2011/06/30 00:52:58 matt Exp $   */
+/*     $NetBSD: pmap.c,v 1.71 2012/01/09 06:49:25 kiyohara Exp $       */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.70 2011/06/30 00:52:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.71 2012/01/09 06:49:25 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -875,7 +875,9 @@
 
        /* If this is a real fault, enter it in the tlb */
        if (tte && ((flags & PMAP_WIRED) == 0)) {
+               int s2 = splhigh();
                ppc4xx_tlb_enter(pm->pm_ctx, va, tte);
+               splx(s2);
        }
        splx(s);
 
@@ -1289,7 +1291,7 @@
        tlbpid_t pid;
        u_short msr;
        paddr_t pa;
-       int s, sz;
+       int sz;
 
        tlbenter_ev.ev_count++;
 
@@ -1299,7 +1301,6 @@
        tl = (pte & ~TLB_RPN_MASK) | pa;
        tl |= ppc4xx_tlbflags(va, pa);
 
-       s = splhigh();
        idx = ppc4xx_tlb_find_victim();
 
 #ifdef DIAGNOSTIC
@@ -1330,7 +1331,6 @@
                "sync; isync;"
        : "=&r" (msr), "=&r" (pid)
        : "r" (ctx), "r" (idx), "r" (tl), "r" (th));
-       splx(s);
 }
 
 void