With the removal of kern/uipc_jumbo.c and sys/jumbo.h,

vm_object_allocate_wait() is not used.  Remove it.

2 files changed, 5 insertions, 22 deletions

diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 9704be0..4a0858f 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -321,26 +321,6 @@ vm_object_pip_wait(vm_object_t object, char *waitid)
 }
 
 /*
- *	vm_object_allocate_wait
- *
- *	Return a new object with the given size, and give the user the
- *	option of waiting for it to complete or failing if the needed
- *	memory isn't available.
- */
-vm_object_t
-vm_object_allocate_wait(objtype_t type, vm_pindex_t size, int flags)
-{
-	vm_object_t result;
-
-	result = (vm_object_t) uma_zalloc(obj_zone, flags);
-
-	if (result != NULL)
-		_vm_object_allocate(type, size, result);
-
-	return (result);
-}
-
-/*
  *	vm_object_allocate:
  *
  *	Returns a new object with the given size.
@@ -348,7 +328,11 @@ vm_object_allocate_wait(objtype_t type, vm_pindex_t size, int flags)
 vm_object_t
 vm_object_allocate(objtype_t type, vm_pindex_t size)
 {
-	return(vm_object_allocate_wait(type, size, M_WAITOK));
+	vm_object_t object;
+
+	object = (vm_object_t)uma_zalloc(obj_zone, M_WAITOK);
+	_vm_object_allocate(type, size, object);
+	return (object);
 }
 
 
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 1f1acb6..34ed83d 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -199,7 +199,6 @@ void vm_object_pip_wakeupn(vm_object_t object, short i);
 void vm_object_pip_wait(vm_object_t object, char *waitid);
 
 vm_object_t vm_object_allocate (objtype_t, vm_pindex_t);
-vm_object_t vm_object_allocate_wait (objtype_t, vm_pindex_t, int);
 void _vm_object_allocate (objtype_t, vm_pindex_t, vm_object_t);
 boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t);
 void vm_object_collapse (vm_object_t);