1 files changed, 28 insertions, 7 deletions

diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index ba4c026..2b29baf 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -169,34 +169,49 @@ extern vm_object_t kmem_object;
 
 #ifdef _KERNEL
 
+/*
+ * For now a global vm lock.
+ */
+#define	VM_OBJECT_MTX(object)	(&vm_mtx)
+
 static __inline void
 vm_object_set_flag(vm_object_t object, u_short bits)
 {
-	atomic_set_short(&object->flags, bits);
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
+	object->flags |= bits;
 }
 
 static __inline void
 vm_object_clear_flag(vm_object_t object, u_short bits)
 {
-	atomic_clear_short(&object->flags, bits);
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
+	object->flags &= ~bits;
 }
 
 static __inline void
 vm_object_pip_add(vm_object_t object, short i)
 {
-	atomic_add_short(&object->paging_in_progress, i);
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
+	object->paging_in_progress += i;
 }
 
 static __inline void
 vm_object_pip_subtract(vm_object_t object, short i)
 {
-	atomic_subtract_short(&object->paging_in_progress, i);
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
+	object->paging_in_progress -= i;
 }
 
 static __inline void
 vm_object_pip_wakeup(vm_object_t object)
 {
-	atomic_subtract_short(&object->paging_in_progress, 1);
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
+	object->paging_in_progress--;
 	if ((object->flags & OBJ_PIPWNT) && object->paging_in_progress == 0) {
 		vm_object_clear_flag(object, OBJ_PIPWNT);
 		wakeup(object);
@@ -206,8 +221,10 @@ vm_object_pip_wakeup(vm_object_t object)
 static __inline void
 vm_object_pip_wakeupn(vm_object_t object, short i)
 {
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
 	if (i)
-		atomic_subtract_short(&object->paging_in_progress, i);
+		object->paging_in_progress -= i;
 	if ((object->flags & OBJ_PIPWNT) && object->paging_in_progress == 0) {
 		vm_object_clear_flag(object, OBJ_PIPWNT);
 		wakeup(object);
@@ -217,11 +234,13 @@ vm_object_pip_wakeupn(vm_object_t object, short i)
 static __inline void
 vm_object_pip_sleep(vm_object_t object, char *waitid)
 {
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
 	if (object->paging_in_progress) {
 		int s = splvm();
 		if (object->paging_in_progress) {
 			vm_object_set_flag(object, OBJ_PIPWNT);
-			tsleep(object, PVM, waitid, 0);
+			msleep(object, VM_OBJECT_MTX(object), PVM, waitid, 0);
 		}
 		splx(s);
 	}
@@ -230,6 +249,8 @@ vm_object_pip_sleep(vm_object_t object, char *waitid)
 static __inline void
 vm_object_pip_wait(vm_object_t object, char *waitid)
 {
+
+	mtx_assert(VM_OBJECT_MTX(object), MA_OWNED);
 	while (object->paging_in_progress)
 		vm_object_pip_sleep(object, waitid);
 }