[src/netbsd-7]: src/sys Pull up following revision(s) (requested by maxv in t...

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

details:   https://anonhg.NetBSD.org/src/rev/0c9c648fbfa4
branches:  netbsd-7
changeset: 799136:0c9c648fbfa4
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Mar 25 16:54:37 2015 +0000

description:
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).

diffstat:

 sys/kern/kern_malloc.c           |  14 ++------------
 sys/kern/kern_pmf.c              |   7 ++-----
 sys/rump/librump/rumpkern/rump.c |   5 ++---
 sys/uvm/uvm_extern.h             |   3 +--
 sys/uvm/uvm_km.c                 |   7 ++-----
 5 files changed, 9 insertions(+), 27 deletions(-)

diffs (137 lines):

diff -r 60daf60f6d68 -r 0c9c648fbfa4 sys/kern/kern_malloc.c
--- a/sys/kern/kern_malloc.c    Wed Mar 25 16:45:01 2015 +0000
+++ b/sys/kern/kern_malloc.c    Wed Mar 25 16:54:37 2015 +0000
@@ -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 @@
        free(curaddr, ksp);
        return newaddr;
 }
-
-/*
- * Initialize the kernel memory allocator
- */
-void
-kmeminit(void)
-{
-}
diff -r 60daf60f6d68 -r 0c9c648fbfa4 sys/kern/kern_pmf.c
--- a/sys/kern/kern_pmf.c       Wed Mar 25 16:45:01 2015 +0000
+++ b/sys/kern/kern_pmf.c       Wed Mar 25 16:54:37 2015 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 
 /* #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;
diff -r 60daf60f6d68 -r 0c9c648fbfa4 sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Wed Mar 25 16:45:01 2015 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Wed Mar 25 16:54:37 2015 +0000
@@ -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 @@
        prop_kern_init();
 
        kmem_init();
-       kmeminit();
 
        uvm_ra_init();
        uao_init();
diff -r 60daf60f6d68 -r 0c9c648fbfa4 sys/uvm/uvm_extern.h
--- a/sys/uvm/uvm_extern.h      Wed Mar 25 16:45:01 2015 +0000
+++ b/sys/uvm/uvm_extern.h      Wed Mar 25 16:54:37 2015 +0000
@@ -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 @@
 
 /* kern_malloc.c */
 void                   kmeminit_nkmempages(void);
-void                   kmeminit(void);
 extern int             nkmempages;
 
 #endif /* _KERNEL */
diff -r 60daf60f6d68 -r 0c9c648fbfa4 sys/uvm/uvm_km.c
--- a/sys/uvm/uvm_km.c  Wed Mar 25 16:45:01 2015 +0000
+++ b/sys/uvm/uvm_km.c  Wed Mar 25 16:54:37 2015 +0000
@@ -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 @@
 void
 uvm_km_init(void)
 {
-
        kmem_init();
-
-       kmeminit(); // killme
 }
 
 /*