Module Name: src
Committed By: yamt
Date: Fri Nov 2 08:19:04 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern [yamt-pagecache]: vm.c
Log Message:
fix a merge botch
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.6 -r1.120.2.7 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.120.2.6 src/sys/rump/librump/rumpkern/vm.c:1.120.2.7
--- src/sys/rump/librump/rumpkern/vm.c:1.120.2.6 Tue Oct 30 17:22:54 2012
+++ src/sys/rump/librump/rumpkern/vm.c Fri Nov 2 08:19:04 2012
@@ -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_pagezero(struct vm_page *pg)
}
/*
- * 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
*/
