Module Name: src
Committed By: maxv
Date: Fri Feb 6 18:19:22 UTC 2015
Modified Files:
src/sys/kern: kern_malloc.c
src/sys/rump/librump/rumpkern: rump.c
src/sys/uvm: uvm_extern.h uvm_km.c
Log Message:
Kill kmeminit().
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/kern/kern_malloc.c
cvs rdiff -u -r1.315 -r1.316 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.192 -r1.193 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.138 -r1.139 src/sys/uvm/uvm_km.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/kern/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.143 src/sys/kern/kern_malloc.c:1.144
--- src/sys/kern/kern_malloc.c:1.143 Mon May 19 02:51:24 2014
+++ src/sys/kern/kern_malloc.c Fri Feb 6 18:19:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.143 2014/05/19 02:51:24 rmind Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.144 2015/02/06 18:19:22 maxv Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.143 2014/05/19 02:51:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.144 2015/02/06 18:19:22 maxv Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -200,11 +200,3 @@ kern_realloc(void *curaddr, unsigned lon
free(curaddr, ksp);
return newaddr;
}
-
-/*
- * Initialize the kernel memory allocator
- */
-void
-kmeminit(void)
-{
-}
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.315 src/sys/rump/librump/rumpkern/rump.c:1.316
--- src/sys/rump/librump/rumpkern/rump.c:1.315 Wed Jan 7 22:24:04 2015
+++ src/sys/rump/librump/rumpkern/rump.c Fri Feb 6 18:19:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.315 2015/01/07 22:24:04 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.316 2015/02/06 18:19:22 maxv Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.315 2015/01/07 22:24:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.316 2015/02/06 18:19:22 maxv Exp $");
#include <sys/systm.h>
#define ELFSIZE ARCH_ELFSIZE
@@ -307,7 +307,6 @@ rump_init(void)
prop_kern_init();
kmem_init();
- kmeminit();
uvm_ra_init();
uao_init();
Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.192 src/sys/uvm/uvm_extern.h:1.193
--- src/sys/uvm/uvm_extern.h:1.192 Sun Dec 14 23:48:58 2014
+++ src/sys/uvm/uvm_extern.h Fri Feb 6 18:19:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_extern.h,v 1.192 2014/12/14 23:48:58 chs Exp $ */
+/* $NetBSD: uvm_extern.h,v 1.193 2015/02/06 18:19:22 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -741,7 +741,6 @@ bool uvn_needs_writefault_p(struct uvm
/* kern_malloc.c */
void kmeminit_nkmempages(void);
-void kmeminit(void);
extern int nkmempages;
#endif /* _KERNEL */
Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.138 src/sys/uvm/uvm_km.c:1.139
--- src/sys/uvm/uvm_km.c:1.138 Tue Jan 29 21:29:40 2013
+++ src/sys/uvm/uvm_km.c Fri Feb 6 18:19:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.138 2013/01/29 21:29:40 para Exp $ */
+/* $NetBSD: uvm_km.c,v 1.139 2015/02/06 18:19:22 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.138 2013/01/29 21:29:40 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.139 2015/02/06 18:19:22 maxv Exp $");
#include "opt_uvmhist.h"
@@ -364,10 +364,7 @@ uvm_km_bootstrap(vaddr_t start, vaddr_t
void
uvm_km_init(void)
{
-
kmem_init();
-
- kmeminit(); // killme
}
/*
