Module Name: src
Committed By: pooka
Date: Tue Mar 11 20:22:47 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: vm.c
src/sys/uvm: uvm_object.c
Log Message:
deduplicate uvm_object_printit() implementation
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/uvm_object.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.150 src/sys/rump/librump/rumpkern/vm.c:1.151
--- src/sys/rump/librump/rumpkern/vm.c:1.150 Mon Mar 3 16:50:28 2014
+++ src/sys/rump/librump/rumpkern/vm.c Tue Mar 11 20:22:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.150 2014/03/03 16:50:28 pooka Exp $ */
+/* $NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka 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.150 2014/03/03 16:50:28 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.151 2014/03/11 20:22:47 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -659,16 +659,6 @@ ubc_purge(struct uvm_object *uobj)
}
-#ifdef DEBUGPRINT
-void
-uvm_object_printit(struct uvm_object *uobj, bool full,
- void (*pr)(const char *, ...))
-{
-
- pr("VM OBJECT at %p, refs %d", uobj, uobj->uo_refs);
-}
-#endif
-
vaddr_t
uvm_default_mapaddr(struct proc *p, vaddr_t base, vsize_t sz)
{
Index: src/sys/uvm/uvm_object.c
diff -u src/sys/uvm/uvm_object.c:1.11 src/sys/uvm/uvm_object.c:1.12
--- src/sys/uvm/uvm_object.c:1.11 Sat Aug 27 09:11:53 2011
+++ src/sys/uvm/uvm_object.c Tue Mar 11 20:22:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_object.c,v 1.11 2011/08/27 09:11:53 christos Exp $ */
+/* $NetBSD: uvm_object.c,v 1.12 2014/03/11 20:22:47 pooka Exp $ */
/*
* Copyright (c) 2006, 2010 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.11 2011/08/27 09:11:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_object.c,v 1.12 2014/03/11 20:22:47 pooka Exp $");
#include "opt_ddb.h"
@@ -227,7 +227,7 @@ uvm_obj_unwirepages(struct uvm_object *u
mutex_exit(uobj->vmobjlock);
}
-#if (defined(DDB) || defined(DEBUGPRINT)) && !defined(_RUMPKERNEL)
+#if defined(DDB) || defined(DEBUGPRINT)
/*
* uvm_object_printit: actually prints the object
