CVS commit: [rmind-uvmplock] src/sys/rump/librump/rumpkern

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Sun Jun 12 02:39:37 UTC 2011

Modified Files:
        src/sys/rump/librump/rumpkern [rmind-uvmplock]: vm.c

Log Message:
Sync RUMP's uvm_pagealloc_strat() and processpage() with branch changes.


To generate a diff of this commit:
cvs rdiff -u -r1.70.4.5 -r1.70.4.6 src/sys/rump/librump/rumpkern/vm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.70.4.5 src/sys/rump/librump/rumpkern/vm.c:1.70.4.6
--- src/sys/rump/librump/rumpkern/vm.c:1.70.4.5	Thu Apr 21 01:42:17 2011
+++ src/sys/rump/librump/rumpkern/vm.c	Sun Jun 12 02:39:37 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.70.4.5 2011/04/21 01:42:17 rmind Exp $	*/
+/*	$NetBSD: vm.c,v 1.70.4.6 2011/06/12 02:39:37 rmind Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.70.4.5 2011/04/21 01:42:17 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.70.4.6 2011/06/12 02:39:37 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -173,7 +173,7 @@
 {
 	struct vm_page *pg;
 
-	KASSERT(uobj && mutex_owned(&uobj->vmobjlock));
+	KASSERT(uobj && mutex_owned(uobj->vmobjlock));
 	KASSERT(anon == NULL);
 
 	pg = pool_cache_get(&pagecache, PR_NOWAIT);
@@ -569,7 +569,7 @@
 	int i;
 
 	KASSERT(npgs > 0);
-	KASSERT(mutex_owned(&pgs[0]->uobject->vmobjlock));
+	KASSERT(mutex_owned(pgs[0]->uobject->vmobjlock));
 
 	for (i = 0; i < npgs; i++) {
 		pg = pgs[i];
@@ -952,23 +952,23 @@
 	struct uvm_object *uobj;
 
 	uobj = pg->uobject;
-	if (mutex_tryenter(&uobj->vmobjlock)) {
+	if (mutex_tryenter(uobj->vmobjlock)) {
 		if ((pg->flags & PG_BUSY) == 0) {
 			mutex_exit(&uvm_pageqlock);
 			uobj->pgops->pgo_put(uobj, pg->offset,
 			    pg->offset + PAGE_SIZE,
 			    PGO_CLEANIT|PGO_FREE);
-			KASSERT(!mutex_owned(&uobj->vmobjlock));
+			KASSERT(!mutex_owned(uobj->vmobjlock));
 			return true;
 		} else {
-			mutex_exit(&uobj->vmobjlock);
+			mutex_exit(uobj->vmobjlock);
 		}
 	} else if (*lockrunning == false && ncpu > 1) {
 		CPU_INFO_ITERATOR cii;
 		struct cpu_info *ci;
 		struct lwp *l;
 
-		l = mutex_owner(&uobj->vmobjlock);
+		l = mutex_owner(uobj->vmobjlock);
 		for (CPU_INFO_FOREACH(cii, ci)) {
 			if (ci->ci_curlwp == l) {
 				*lockrunning = true;