From d9c30e05f502dcfd004e5fb113481e298cca349a Mon Sep 17 00:00:00 2001 From: rink Date: Sat, 17 Jun 2006 20:10:32 +0000 Subject: Prevent 'mutex not owned' panic on boot if INVARIANTS is in the kernel. This makes the GENERIC kernel boot on ppc. Reviewed by: grehan Approved by: imp (mentor) MFC after: 1 week dCVS: ---------------------------------------------------------------------- --- sys/powerpc/aim/mmu_oea.c | 2 ++ sys/powerpc/powerpc/mmu_oea.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'sys/powerpc') diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 6a9af00..8cd8c2e 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -832,9 +832,11 @@ moea_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelend) struct vm_page m; m.phys_addr = translations[i].om_pa + off; + PMAP_LOCK(&ofw_pmap); moea_enter_locked(&ofw_pmap, translations[i].om_va + off, &m, VM_PROT_ALL, 1); + PMAP_UNLOCK(&ofw_pmap); ofw_mappings++; } } diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c index 6a9af00..8cd8c2e 100644 --- a/sys/powerpc/powerpc/mmu_oea.c +++ b/sys/powerpc/powerpc/mmu_oea.c @@ -832,9 +832,11 @@ moea_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelend) struct vm_page m; m.phys_addr = translations[i].om_pa + off; + PMAP_LOCK(&ofw_pmap); moea_enter_locked(&ofw_pmap, translations[i].om_va + off, &m, VM_PROT_ALL, 1); + PMAP_UNLOCK(&ofw_pmap); ofw_mappings++; } } -- cgit v1.1