diff options
| author | imp <imp@FreeBSD.org> | 2008-10-01 05:47:17 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2008-10-01 05:47:17 +0000 |
| commit | b934ed77165c1a5ab368778f35de59a554860fd0 (patch) | |
| tree | 393b0f1c669bd3f42d66eb581c25a3b41632af26 /sys/mips | |
| parent | 26119416f8ff79b970f64afeae70fca27dd5e158 (diff) | |
| download | FreeBSD-src-b934ed77165c1a5ab368778f35de59a554860fd0.zip FreeBSD-src-b934ed77165c1a5ab368778f35de59a554860fd0.tar.gz | |
Remove critical_enter() and critical_exit(): pmap_growkernel is called
with kernel_map->system_mtx held so these aren't needed. Add an
assertion to make sure this is the case.
Also, fix a minor style(9) nit.
Reviewed by: alc@
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/mips/pmap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c index c5e090d..70eaa31 100644 --- a/sys/mips/mips/pmap.c +++ b/sys/mips/mips/pmap.c @@ -452,9 +452,8 @@ void pmap_init(void) { - if (need_wired_tlb_page_pool) { + if (need_wired_tlb_page_pool) pmap_init_fpage(); - } /* * Initialize the address space (zone) for the pv entries. Set a * high water mark so that the system can recover from excessive @@ -1203,7 +1202,7 @@ pmap_growkernel(vm_offset_t addr) pt_entry_t *pte; int i, req; - critical_enter(); + mtx_assert(&kernel_map->system_mtx, MA_OWNED); if (kernel_vm_end == 0) { kernel_vm_end = VM_MIN_KERNEL_ADDRESS + VM_KERNEL_ALLOC_OFFSET; nkpt = 0; @@ -1276,7 +1275,6 @@ pmap_growkernel(vm_offset_t addr) break; } } - critical_exit(); } /*************************************************** |
