From 36e7a51ea1dedf0fc860ff3106aee1db1ab3b1f5 Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sun, 12 Oct 1997 20:26:33 +0000
Subject: Last major round (Unless Bruce thinks of somthing :-) of malloc
 changes.

Distribute all but the most fundamental malloc types.  This time I also
remembered the trick to making things static:  Put "static" in front of
them.

A couple of finer points by:	bde
---
 sys/i386/i386/machdep.c    | 3 ++-
 sys/i386/i386/userconfig.c | 6 +++---
 sys/i386/isa/rp.c          | 2 +-
 sys/i386/isa/sio.c         | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'sys/i386')

diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 01600cf..0ab6bca 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.267 1997/10/10 09:44:02 peter Exp $
+ *	$Id: machdep.c,v 1.268 1997/10/10 12:42:52 peter Exp $
  */
 
 #include "apm.h"
@@ -134,6 +134,7 @@ extern void initializecpu(void);
 static void cpu_startup __P((void *));
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
+static MALLOC_DEFINE(M_MBUF, "mbuf", "mbuf");
 
 #ifdef BOUNCE_BUFFERS
 extern char *bouncememory;
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 5918a60..2aba045 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.93 1997/09/18 08:00:48 jmg Exp $
+ **      $Id: userconfig.c,v 1.94 1997/10/11 18:31:19 phk Exp $
  **/
 
 /**
@@ -126,7 +126,7 @@
 
 #include <pci/pcivar.h>
 
-MALLOC_DEFINE(M_DEVL, "isa_devlist", "isa_device lists in userconfig()");
+static MALLOC_DEFINE(M_DEVL, "isa_devlist", "isa_device lists in userconfig()");
 
 static struct isa_device *isa_devlist;	/* list read by dset to extract changes */
 
@@ -2367,7 +2367,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.93 1997/09/18 08:00:48 jmg Exp $
+ *      $Id: userconfig.c,v 1.94 1997/10/11 18:31:19 phk Exp $
  */
 
 #include "scbus.h"
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index 0403e89..580e4cc 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -37,11 +37,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
+#include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 
 #include <i386/isa/isa_device.h>
 
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 21beb8c..39c6470 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.182 1997/09/19 15:25:49 jmg Exp $
+ *	$Id: sio.c,v 1.183 1997/09/21 21:41:40 gibbs Exp $
  */
 
 #include "opt_comconsole.h"
@@ -62,13 +62,13 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
+#include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 #ifdef DEVFS
-- 
cgit v1.1