[src/rmind-uvmplock]: src/sys/rump/librump/rumpkern Sync RUMP's uvm_pagealloc...

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f8c8180865f
branches:  rmind-uvmplock
changeset: 753097:4f8c8180865f
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Jun 12 02:39:37 2011 +0000

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

diffstat:

 sys/rump/librump/rumpkern/vm.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 1e5574e3d27d -r 4f8c8180865f sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Sun Jun 12 02:32:29 2011 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Sun Jun 12 02:39:37 2011 +0000
@@ -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;