From de5ef10142c4ca2c7b8003316c2bafb2b60e6265 Mon Sep 17 00:00:00 2001
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 14 Apr 2003 00:36:53 +0000
Subject: [PATCH] Update locking on the kernel_object to use the new macros.

---
 sys/kern/vfs_bio.c | 8 ++++----
 sys/vm/vm_contig.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 2da3ed4cb1b..6893c8afd19 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -586,11 +586,11 @@ bufinit(void)
  */
 
 	bogus_offset = kmem_alloc_pageable(kernel_map, PAGE_SIZE);
-	vm_object_lock(kernel_object);
+	VM_OBJECT_LOCK(kernel_object);
 	bogus_page = vm_page_alloc(kernel_object,
 			((bogus_offset - VM_MIN_KERNEL_ADDRESS) >> PAGE_SHIFT),
 	    VM_ALLOC_NORMAL | VM_ALLOC_WIRED);
-	vm_object_unlock(kernel_object);
+	VM_OBJECT_UNLOCK(kernel_object);
 }
 
 /*
@@ -3535,11 +3535,11 @@ tryagain:
 		 * could intefere with paging I/O, no matter which
 		 * process we are.
 		 */
-		vm_object_lock(kernel_object);
+		VM_OBJECT_LOCK(kernel_object);
 		p = vm_page_alloc(kernel_object,
 			((pg - VM_MIN_KERNEL_ADDRESS) >> PAGE_SHIFT),
 		    VM_ALLOC_SYSTEM | VM_ALLOC_WIRED);
-		vm_object_unlock(kernel_object);
+		VM_OBJECT_UNLOCK(kernel_object);
 		if (!p) {
 			atomic_add_int(&vm_pageout_deficit,
 			    (to - pg) >> PAGE_SHIFT);
diff --git a/sys/vm/vm_contig.c b/sys/vm/vm_contig.c
index 51f2cd841eb..da30a005034 100644
--- a/sys/vm/vm_contig.c
+++ b/sys/vm/vm_contig.c
@@ -244,14 +244,14 @@ again1:
 		vm_map_unlock(map);
 
 		tmp_addr = addr;
-		vm_object_lock(kernel_object);
+		VM_OBJECT_LOCK(kernel_object);
 		for (i = start; i < (start + size / PAGE_SIZE); i++) {
 			vm_page_t m = &pga[i];
 			vm_page_insert(m, kernel_object,
 				OFF_TO_IDX(tmp_addr - VM_MIN_KERNEL_ADDRESS));
 			tmp_addr += PAGE_SIZE;
 		}
-		vm_object_unlock(kernel_object);
+		VM_OBJECT_UNLOCK(kernel_object);
 		vm_map_wire(map, addr, addr + size, FALSE);
 
 		splx(s);