diff options
| author | alc <alc@FreeBSD.org> | 2010-04-13 06:48:37 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2010-04-13 06:48:37 +0000 |
| commit | 93c04293ef89bc34224e653837ffd715c112e945 (patch) | |
| tree | 83b19f943697ed3f34f099234569644a8da8e866 /sys/vm/vm_glue.c | |
| parent | 57fe2192005167a2ac8f6f1a327f825c7fee271c (diff) | |
| download | FreeBSD-src-93c04293ef89bc34224e653837ffd715c112e945.zip FreeBSD-src-93c04293ef89bc34224e653837ffd715c112e945.tar.gz | |
Simplify vm_thread_swapin().
Diffstat (limited to 'sys/vm/vm_glue.c')
| -rw-r--r-- | sys/vm/vm_glue.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index c52dedd..c080ca0 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -536,7 +536,8 @@ vm_thread_swapin(struct thread *td) ksobj = td->td_kstack_obj; VM_OBJECT_LOCK(ksobj); for (i = 0; i < pages; i++) { - m = vm_page_grab(ksobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + m = vm_page_grab(ksobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | + VM_ALLOC_WIRED); if (m->valid != VM_PAGE_BITS_ALL) { rv = vm_pager_get_pages(ksobj, &m, 1, 0); if (rv != VM_PAGER_OK) @@ -544,9 +545,6 @@ vm_thread_swapin(struct thread *td) m = vm_page_lookup(ksobj, i); } ma[i] = m; - vm_page_lock_queues(); - vm_page_wire(m); - vm_page_unlock_queues(); vm_page_wakeup(m); } VM_OBJECT_UNLOCK(ksobj); |
