diff options
| -rw-r--r-- | sys/amd64/amd64/vm_machdep.c | 3 | ||||
| -rw-r--r-- | sys/i386/i386/vm_machdep.c | 3 | ||||
| -rw-r--r-- | sys/kern/kern_exec.c | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index eda238643a7a..8a00264fb222 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -570,7 +570,6 @@ vm_page_zero_idle() static int free_rover; static int zero_state; vm_page_t m; - int s; /* * Attempt to maintain approximately 1/2 of our free pages in a @@ -592,7 +591,6 @@ vm_page_zero_idle() return(0); } - s = splvm(); zero_state = 0; m = vm_page_list_find(PQ_FREE, free_rover, FALSE); if (m != NULL && (m->flags & PG_ZERO) == 0) { @@ -613,7 +611,6 @@ vm_page_zero_idle() zero_state = 1; } free_rover = (free_rover + PQ_PRIME2) & PQ_L2_MASK; - splx(s); mtx_unlock(&vm_mtx); return (1); } diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index eda238643a7a..8a00264fb222 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -570,7 +570,6 @@ vm_page_zero_idle() static int free_rover; static int zero_state; vm_page_t m; - int s; /* * Attempt to maintain approximately 1/2 of our free pages in a @@ -592,7 +591,6 @@ vm_page_zero_idle() return(0); } - s = splvm(); zero_state = 0; m = vm_page_list_find(PQ_FREE, free_rover, FALSE); if (m != NULL && (m->flags & PG_ZERO) == 0) { @@ -613,7 +611,6 @@ vm_page_zero_idle() zero_state = 1; } free_rover = (free_rover + PQ_PRIME2) & PQ_L2_MASK; - splx(s); mtx_unlock(&vm_mtx); return (1); } diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 8f49538f038b..abb08fcf2ace 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -400,7 +400,7 @@ int exec_map_first_page(imgp) struct image_params *imgp; { - int s, rv, i; + int rv, i; int initial_pagein; vm_page_t ma[VM_INITIAL_PAGEIN]; vm_object_t object; @@ -411,7 +411,6 @@ exec_map_first_page(imgp) } VOP_GETVOBJECT(imgp->vp, &object); - s = splvm(); mtx_lock(&vm_mtx); ma[0] = vm_page_grab(object, 0, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); @@ -443,7 +442,6 @@ exec_map_first_page(imgp) vm_page_protect(ma[0], VM_PROT_NONE); vm_page_free(ma[0]); } - splx(s); mtx_unlock(&vm_mtx); return EIO; } @@ -451,7 +449,6 @@ exec_map_first_page(imgp) vm_page_wire(ma[0]); vm_page_wakeup(ma[0]); - splx(s); pmap_kenter((vm_offset_t) imgp->image_header, VM_PAGE_TO_PHYS(ma[0])); imgp->firstpage = ma[0]; |