Date: Tue, 13 Apr 2010 06:48:37 +0000 (UTC) From: Alan Cox <alc@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r206545 - head/sys/vm Message-ID: <201004130648.o3D6mbX7071595@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: alc Date: Tue Apr 13 06:48:37 2010 New Revision: 206545 URL: http://svn.freebsd.org/changeset/base/206545 Log: Simplify vm_thread_swapin(). Modified: head/sys/vm/vm_glue.c Modified: head/sys/vm/vm_glue.c ============================================================================== --- head/sys/vm/vm_glue.c Tue Apr 13 06:27:02 2010 (r206544) +++ head/sys/vm/vm_glue.c Tue Apr 13 06:48:37 2010 (r206545) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004130648.o3D6mbX7071595>