o Add a "needs wakeup" flag to the vm_map for use by kmem_alloc_wait()

   and kmem_free_wakeup().  Previously, kmem_free_wakeup() always
   called wakeup().  In general, no one was sleeping.
 o Export vm_map_unlock_and_wait() and vm_map_wakeup() from vm_map.c
   for use in vm_kern.c.

1 files changed, 7 insertions, 4 deletions

diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 8da9d44..5f6ef3f 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -473,10 +473,10 @@ kmem_alloc_wait(map, size)
 			vm_map_unlock(map);
 			return (0);
 		}
-		vm_map_unlock(map);
-		tsleep(map, PVM, "kmaw", 0);
+		map->needs_wakeup = TRUE;
+		vm_map_unlock_and_wait(map, FALSE);
 	}
-	vm_map_insert(map, NULL, (vm_offset_t) 0, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0);
+	vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0);
 	vm_map_unlock(map);
 	return (addr);
 }
@@ -497,7 +497,10 @@ kmem_free_wakeup(map, addr, size)
 
 	vm_map_lock(map);
 	(void) vm_map_delete(map, trunc_page(addr), round_page(addr + size));
-	wakeup(map);
+	if (map->needs_wakeup) {
+		map->needs_wakeup = FALSE;
+		vm_map_wakeup(map);
+	}
 	vm_map_unlock(map);
 }