Don't call critical_enter()/critical_exit() around calls to pmap_pvo_enter()

as it does it's own handling of critical sections.

3 files changed, 0 insertions, 24 deletions

diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index fa03220..0ba2131 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -876,13 +876,9 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 	if (wired)
 		pvo_flags |= PVO_WIRED;
 
-	critical_enter();
-
 	error = pmap_pvo_enter(pmap, zone, pvo_head, va, m->phys_addr, pte_lo,
 	    pvo_flags);
 
-	critical_exit();
-
 	if (error == ENOENT) {
 		/*
 		 * Flush the real memory from the cache.
@@ -971,13 +967,9 @@ pmap_kenter(vm_offset_t va, vm_offset_t pa)
 		}
 	}
 
-	critical_enter();
-
 	error = pmap_pvo_enter(kernel_pmap, pmap_upvo_zone,
 	    &pmap_pvo_kunmanaged, va, pa, pte_lo, PVO_WIRED);
 
-	critical_exit();
-
 	if (error != 0 && error != ENOENT)
 		panic("pmap_kenter: failed to enter va %#x pa %#x: %d", va,
 		    pa, error);
diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c
index fa03220..0ba2131 100644
--- a/sys/powerpc/powerpc/mmu_oea.c
+++ b/sys/powerpc/powerpc/mmu_oea.c
@@ -876,13 +876,9 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 	if (wired)
 		pvo_flags |= PVO_WIRED;
 
-	critical_enter();
-
 	error = pmap_pvo_enter(pmap, zone, pvo_head, va, m->phys_addr, pte_lo,
 	    pvo_flags);
 
-	critical_exit();
-
 	if (error == ENOENT) {
 		/*
 		 * Flush the real memory from the cache.
@@ -971,13 +967,9 @@ pmap_kenter(vm_offset_t va, vm_offset_t pa)
 		}
 	}
 
-	critical_enter();
-
 	error = pmap_pvo_enter(kernel_pmap, pmap_upvo_zone,
 	    &pmap_pvo_kunmanaged, va, pa, pte_lo, PVO_WIRED);
 
-	critical_exit();
-
 	if (error != 0 && error != ENOENT)
 		panic("pmap_kenter: failed to enter va %#x pa %#x: %d", va,
 		    pa, error);
diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c
index fa03220..0ba2131 100644
--- a/sys/powerpc/powerpc/pmap.c
+++ b/sys/powerpc/powerpc/pmap.c
@@ -876,13 +876,9 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 	if (wired)
 		pvo_flags |= PVO_WIRED;
 
-	critical_enter();
-
 	error = pmap_pvo_enter(pmap, zone, pvo_head, va, m->phys_addr, pte_lo,
 	    pvo_flags);
 
-	critical_exit();
-
 	if (error == ENOENT) {
 		/*
 		 * Flush the real memory from the cache.
@@ -971,13 +967,9 @@ pmap_kenter(vm_offset_t va, vm_offset_t pa)
 		}
 	}
 
-	critical_enter();
-
 	error = pmap_pvo_enter(kernel_pmap, pmap_upvo_zone,
 	    &pmap_pvo_kunmanaged, va, pa, pte_lo, PVO_WIRED);
 
-	critical_exit();
-
 	if (error != 0 && error != ENOENT)
 		panic("pmap_kenter: failed to enter va %#x pa %#x: %d", va,
 		    pa, error);