[src/yamt-pagecache]: src/sys/rump/librump fix a merge botch

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

details:   https://anonhg.NetBSD.org/src/rev/91730c4fe56e
branches:  yamt-pagecache
changeset: 770890:91730c4fe56e
user:      yamt <yamt%NetBSD.org@localhost>
date:      Fri Nov 02 08:19:04 2012 +0000

description:
fix a merge botch

diffstat:

 sys/rump/librump/rumpkern/vm.c    |  16 ++--------------
 sys/rump/librump/rumpvfs/vm_vfs.c |   8 ++------
 2 files changed, 4 insertions(+), 20 deletions(-)

diffs (76 lines):

diff -r 6dbd8498d621 -r 91730c4fe56e sys/rump/librump/rumpkern/vm.c
--- a/sys/rump/librump/rumpkern/vm.c    Tue Oct 30 18:56:04 2012 +0000
+++ b/sys/rump/librump/rumpkern/vm.c    Fri Nov 02 08:19:04 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm.c,v 1.120.2.6 2012/10/30 17:22:54 yamt Exp $        */
+/*     $NetBSD: vm.c,v 1.120.2.7 2012/11/02 08:19:04 yamt 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.120.2.6 2012/10/30 17:22:54 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.120.2.7 2012/11/02 08:19:04 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -226,18 +226,6 @@
 }
 
 /*
- * uvm_page_locked_p: return true if object associated with page is
- * locked.  this is a weak check for runtime assertions only.
- */
-
-bool
-uvm_page_locked_p(struct vm_page *pg)
-{
-
-       return mutex_owned(pg->uobject->vmobjlock);
-}
-
-/*
  * Misc routines
  */
 
diff -r 6dbd8498d621 -r 91730c4fe56e sys/rump/librump/rumpvfs/vm_vfs.c
--- a/sys/rump/librump/rumpvfs/vm_vfs.c Tue Oct 30 18:56:04 2012 +0000
+++ b/sys/rump/librump/rumpvfs/vm_vfs.c Fri Nov 02 08:19:04 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_vfs.c,v 1.32.2.2 2012/10/30 17:22:55 yamt Exp $     */
+/*     $NetBSD: vm_vfs.c,v 1.32.2.3 2012/11/02 08:19:23 yamt Exp $     */
 
 /*
  * Copyright (c) 2008-2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.32.2.2 2012/10/30 17:22:55 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.32.2.3 2012/11/02 08:19:23 yamt Exp $");
 
 #include <sys/param.h>
 
@@ -143,9 +143,7 @@
                        start = (uint8_t *)pg->uanon + chunkoff;
 
                        memset(start, 0, chunklen);
-                       mutex_enter(pguobj->vmobjlock);
                        uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_DIRTY);
-                       mutex_exit(pguobj->vmobjlock);
 
                        off += chunklen;
                        len -= chunklen;
@@ -215,10 +213,8 @@
                                goto out;
                        }
                        if (uio->uio_rw == UIO_WRITE) {
-                               mutex_enter(pguobj->vmobjlock);
                                pg->flags &= ~PG_FAKE;
                                uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_DIRTY);
-                               mutex_exit(pguobj->vmobjlock);
                        }
                        todo -= xfersize;
                }