Module Name: src Committed By: snj Date: Wed Mar 25 16:54:37 UTC 2015
Modified Files: src/sys/kern [netbsd-7]: kern_malloc.c kern_pmf.c src/sys/rump/librump/rumpkern [netbsd-7]: rump.c src/sys/uvm [netbsd-7]: uvm_extern.h uvm_km.c Log Message: Pull up following revision(s) (requested by maxv in ticket #617): sys/kern/kern_malloc.c: revision 1.144, 1.145 sys/kern/kern_pmf.c: revision 1.37 sys/rump/librump/rumpkern/rump.c: revision 1.316 sys/uvm/uvm_extern.h: revision 1.193 sys/uvm/uvm_km.c: revision 1.139 Don't include <uvm/uvm_extern.h> -- Kill kmeminit(). -- Remove this MALLOC_DEFINE (M_PMF unused). To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.143.2.1 src/sys/kern/kern_malloc.c cvs rdiff -u -r1.36 -r1.36.12.1 src/sys/kern/kern_pmf.c cvs rdiff -u -r1.308.2.2 -r1.308.2.3 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.191.2.1 -r1.191.2.2 src/sys/uvm/uvm_extern.h cvs rdiff -u -r1.138 -r1.138.12.1 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.143.2.1 --- src/sys/kern/kern_malloc.c:1.143 Mon May 19 02:51:24 2014 +++ src/sys/kern/kern_malloc.c Wed Mar 25 16:54:37 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.143.2.1 2015/03/25 16:54:37 snj Exp $ */ /* * Copyright (c) 1987, 1991, 1993 @@ -70,14 +70,12 @@ */ #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.143.2.1 2015/03/25 16:54:37 snj Exp $"); #include <sys/param.h> #include <sys/malloc.h> #include <sys/kmem.h> -#include <uvm/uvm_extern.h> - /* * Built-in malloc types. Note: ought to be removed. */ @@ -200,11 +198,3 @@ kern_realloc(void *curaddr, unsigned lon free(curaddr, ksp); return newaddr; } - -/* - * Initialize the kernel memory allocator - */ -void -kmeminit(void) -{ -} Index: src/sys/kern/kern_pmf.c diff -u src/sys/kern/kern_pmf.c:1.36 src/sys/kern/kern_pmf.c:1.36.12.1 --- src/sys/kern/kern_pmf.c:1.36 Tue Nov 13 14:08:07 2012 +++ src/sys/kern/kern_pmf.c Wed Mar 25 16:54:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_pmf.c,v 1.36 2012/11/13 14:08:07 chs Exp $ */ +/* $NetBSD: kern_pmf.c,v 1.36.12.1 2015/03/25 16:54:37 snj Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.36 2012/11/13 14:08:07 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.36.12.1 2015/03/25 16:54:37 snj Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -82,9 +82,6 @@ int pmf_debug_transition; /* #define PMF_DEBUG */ -#include <sys/mallocvar.h> -MALLOC_DEFINE(M_PMF, "pmf", "device pmf messaging memory"); - static prop_dictionary_t pmf_platform = NULL; static struct workqueue *pmf_event_workqueue; static struct workqueue *pmf_suspend_workqueue; Index: src/sys/rump/librump/rumpkern/rump.c diff -u src/sys/rump/librump/rumpkern/rump.c:1.308.2.2 src/sys/rump/librump/rumpkern/rump.c:1.308.2.3 --- src/sys/rump/librump/rumpkern/rump.c:1.308.2.2 Tue Dec 9 19:14:27 2014 +++ src/sys/rump/librump/rumpkern/rump.c Wed Mar 25 16:54:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rump.c,v 1.308.2.2 2014/12/09 19:14:27 martin Exp $ */ +/* $NetBSD: rump.c,v 1.308.2.3 2015/03/25 16:54:37 snj 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.308.2.2 2014/12/09 19:14:27 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.308.2.3 2015/03/25 16:54:37 snj Exp $"); #include <sys/systm.h> #define ELFSIZE ARCH_ELFSIZE @@ -281,7 +281,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.191.2.1 src/sys/uvm/uvm_extern.h:1.191.2.2 --- src/sys/uvm/uvm_extern.h:1.191.2.1 Wed Dec 31 06:44:01 2014 +++ src/sys/uvm/uvm_extern.h Wed Mar 25 16:54:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_extern.h,v 1.191.2.1 2014/12/31 06:44:01 snj Exp $ */ +/* $NetBSD: uvm_extern.h,v 1.191.2.2 2015/03/25 16:54:37 snj 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.138.12.1 --- src/sys/uvm/uvm_km.c:1.138 Tue Jan 29 21:29:40 2013 +++ src/sys/uvm/uvm_km.c Wed Mar 25 16:54:37 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.138.12.1 2015/03/25 16:54:37 snj 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.138.12.1 2015/03/25 16:54:37 snj 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 } /*