summaryrefslogtreecommitdiffstats
path: root/sys/vm/vm_page.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2013-08-22 07:39:53 +0000
committerkib <kib@FreeBSD.org>2013-08-22 07:39:53 +0000
commitba12eedccd58fdeb0e4a9fcb875df2207242789c (patch)
treeebc7f0d660b0d8af7dbd22f485c3a5f29bc589bf /sys/vm/vm_page.c
parent40e805bbd20a3dc78b0a587d39959e082125340f (diff)
downloadFreeBSD-src-ba12eedccd58fdeb0e4a9fcb875df2207242789c.zip
FreeBSD-src-ba12eedccd58fdeb0e4a9fcb875df2207242789c.tar.gz
Remove the deprecated VM_ALLOC_RETRY flag for the vm_page_grab(9).
The flag was mandatory since r209792, where vm_page_grab(9) was changed to only support the alloc retry semantic. Suggested and reviewed by: alc Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/vm/vm_page.c')
-rw-r--r--sys/vm/vm_page.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 01b7cc0..1241775 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -2685,9 +2685,6 @@ vm_page_advise(vm_page_t m, int advice)
* to be in the object. If the page doesn't exist, first allocate it
* and then conditionally zero it.
*
- * The caller must always specify the VM_ALLOC_RETRY flag. This is intended
- * to facilitate its eventual removal.
- *
* This routine may sleep.
*
* The object must be locked on entry. The lock will, however, be released
@@ -2700,8 +2697,6 @@ vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags)
int sleep;
VM_OBJECT_ASSERT_WLOCKED(object);
- KASSERT((allocflags & VM_ALLOC_RETRY) != 0,
- ("vm_page_grab: VM_ALLOC_RETRY is required"));
KASSERT((allocflags & VM_ALLOC_SBUSY) == 0 ||
(allocflags & VM_ALLOC_IGN_SBUSY) != 0,
("vm_page_grab: VM_ALLOC_SBUSY/VM_ALLOC_IGN_SBUSY mismatch"));
@@ -2735,8 +2730,7 @@ retrylookup:
return (m);
}
}
- m = vm_page_alloc(object, pindex, allocflags & ~(VM_ALLOC_RETRY |
- VM_ALLOC_IGN_SBUSY));
+ m = vm_page_alloc(object, pindex, allocflags & ~VM_ALLOC_IGN_SBUSY);
if (m == NULL) {
VM_OBJECT_WUNLOCK(object);
VM_WAIT;
OpenPOWER on IntegriCloud