Author: alc
Date: Sat Feb 26 21:24:13 2011
New Revision: 219065
URL: http://svn.freebsd.org/changeset/base/219065
Log:
MFC r217477
Clean up the start of vm_page_alloc().
Modified:
stable/8/sys/vm/vm_page.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/vm/vm_page.c
==============================================================================
--- stable/8/sys/vm/vm_page.c Sat Feb 26 21:18:38 2011 (r219064)
+++ stable/8/sys/vm/vm_page.c Sat Feb 26 21:24:13 2011 (r219065)
@@ -1102,23 +1102,19 @@ vm_page_alloc(vm_object_t object, vm_pin
vm_page_t m;
int flags, page_req;
- page_req = req & VM_ALLOC_CLASS_MASK;
- KASSERT(curthread->td_intr_nesting_level == 0 ||
- page_req == VM_ALLOC_INTERRUPT,
- ("vm_page_alloc(NORMAL|SYSTEM) in interrupt context"));
-
if ((req & VM_ALLOC_NOOBJ) == 0) {
KASSERT(object != NULL,
("vm_page_alloc: NULL object."));
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
}
+ page_req = req & VM_ALLOC_CLASS_MASK;
+
/*
* The pager is allowed to eat deeper into the free page list.
*/
- if ((curproc == pageproc) && (page_req != VM_ALLOC_INTERRUPT)) {
+ if ((curproc == pageproc) && (page_req != VM_ALLOC_INTERRUPT))
page_req = VM_ALLOC_SYSTEM;
- };
mtx_lock(&vm_page_queue_free_mtx);
if (cnt.v_free_count + cnt.v_cache_count > cnt.v_free_reserved ||
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
