svn commit: r206877 - user/kmacy/head_page_lock_2/sys/vm
Kip Macy
kmacy at FreeBSD.org
Mon Apr 19 22:15:42 UTC 2010
Author: kmacy
Date: Mon Apr 19 22:15:40 2010
New Revision: 206877
URL: http://svn.freebsd.org/changeset/base/206877
Log:
fix mistake in sanity check change to pageout
Modified:
user/kmacy/head_page_lock_2/sys/vm/vm_page.h
user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c
Modified: user/kmacy/head_page_lock_2/sys/vm/vm_page.h
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_page.h Mon Apr 19 22:10:40 2010 (r206876)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_page.h Mon Apr 19 22:15:40 2010 (r206877)
@@ -276,9 +276,11 @@ extern struct vpglocks vm_page_queue_loc
#ifdef VM_PAGE_LOCK
#define vm_page_lockptr(m) pmap_page_lockptr(m)
#define vm_page_lock_queues_assert_notowned() mtx_assert(&vm_page_queue_mtx, MA_NOTOWNED)
+#define vm_page_lock_assert_notowned(m) vm_page_lock_assert((m), MA_NOTOWNED)
#else
#define vm_page_lockptr(m) (&vm_page_queue_mtx)
-#define vm_page_lock_queues_assert_notowned()
+#define vm_page_lock_queues_assert_notowned()
+#define vm_page_lock_assert_notowned()
#endif
#define vm_page_lock(m) mtx_lock(vm_page_lockptr((m)))
#define vm_page_unlock(m) mtx_unlock(vm_page_lockptr((m)))
Modified: user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c Mon Apr 19 22:10:40 2010 (r206876)
+++ user/kmacy/head_page_lock_2/sys/vm/vm_pageout.c Mon Apr 19 22:15:40 2010 (r206877)
@@ -1043,7 +1043,7 @@ rescan0:
}
vm_page_lock_queues();
unlock_and_continue:
- vm_page_lock_queues_assert_notowned();
+ vm_page_lock_assert_notowned(m);
VM_OBJECT_UNLOCK(object);
if (mp != NULL) {
vm_page_unlock_queues();
@@ -1057,9 +1057,7 @@ unlock_and_continue:
next = TAILQ_NEXT(&marker, pageq);
TAILQ_REMOVE(&vm_page_queues[PQ_INACTIVE].pl,
&marker, pageq);
-#ifdef VM_PAGE_LOCK
- vm_page_lock_assert(m, MA_NOTOWNED);
-#endif
+ vm_page_lock_assert_notowned(m);
continue;
}
vm_page_unlock(m);
More information about the svn-src-user
mailing list