From 8ce2d00a044cef91b79cbc72ec106f79186bf34a Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 7 Nov 2007 21:56:58 +0000
Subject: [PATCH] Change unused 'user_wait' argument to 'timo' argument, which
 will be used to specify timeout for msleep(9).

Discussed with:	alc
Reviewed by:	alc
---
 sys/vm/vm_kern.c |  2 +-
 sys/vm/vm_map.c  | 10 +++++-----
 sys/vm/vm_map.h  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index fd01c4e526e..3b6de839d74 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -446,7 +446,7 @@ kmem_alloc_wait(map, size)
 			return (0);
 		}
 		map->needs_wakeup = TRUE;
-		vm_map_unlock_and_wait(map, FALSE);
+		vm_map_unlock_and_wait(map, 0);
 	}
 	vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0);
 	vm_map_unlock(map);
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 96e7411a28a..d042c655834 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -536,12 +536,12 @@ _vm_map_lock_downgrade(vm_map_t map, const char *file, int line)
  *	vm_map_unlock_and_wait:
  */
 int
-vm_map_unlock_and_wait(vm_map_t map, boolean_t user_wait)
+vm_map_unlock_and_wait(vm_map_t map, int timo)
 {
 
 	mtx_lock(&map_sleep_mtx);
 	vm_map_unlock(map);
-	return (msleep(&map->root, &map_sleep_mtx, PDROP | PVM, "vmmaps", 0));
+	return (msleep(&map->root, &map_sleep_mtx, PDROP | PVM, "vmmaps", timo));
 }
 
 /*
@@ -1859,7 +1859,7 @@ vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 			saved_start = (start >= entry->start) ? start :
 			    entry->start;
 			entry->eflags |= MAP_ENTRY_NEEDS_WAKEUP;
-			if (vm_map_unlock_and_wait(map, user_unwire)) {
+			if (vm_map_unlock_and_wait(map, 0)) {
 				/*
 				 * Allow interruption of user unwiring?
 				 */
@@ -2005,7 +2005,7 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 			saved_start = (start >= entry->start) ? start :
 			    entry->start;
 			entry->eflags |= MAP_ENTRY_NEEDS_WAKEUP;
-			if (vm_map_unlock_and_wait(map, user_wire)) {
+			if (vm_map_unlock_and_wait(map, 0)) {
 				/*
 				 * Allow interruption of user wiring?
 				 */
@@ -2361,7 +2361,7 @@ vm_map_delete(vm_map_t map, vm_offset_t start, vm_offset_t end)
 			saved_start = entry->start;
 			entry->eflags |= MAP_ENTRY_NEEDS_WAKEUP;
 			last_timestamp = map->timestamp;
-			(void) vm_map_unlock_and_wait(map, FALSE);
+			(void) vm_map_unlock_and_wait(map, 0);
 			vm_map_lock(map);
 			if (last_timestamp + 1 != map->timestamp) {
 				/*
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index fe5090589f3..1d3d90dc94b 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -272,7 +272,7 @@ int _vm_map_trylock(vm_map_t map, const char *file, int line);
 int _vm_map_trylock_read(vm_map_t map, const char *file, int line);
 int _vm_map_lock_upgrade(vm_map_t map, const char *file, int line);
 void _vm_map_lock_downgrade(vm_map_t map, const char *file, int line);
-int vm_map_unlock_and_wait(vm_map_t map, boolean_t user_wait);
+int vm_map_unlock_and_wait(vm_map_t map, int timo);
 void vm_map_wakeup(vm_map_t map);
 
 #define	vm_map_lock(map)	_vm_map_lock(map, LOCK_FILE, LOCK_LINE)