enlarge msgbuf, somewhat line netbsd did

3 files changed, 12 insertions, 12 deletions

diff --git a/sys/arch/mvme68k/include/param.h b/sys/arch/mvme68k/include/param.h
index 0b4dc1204cf..6146d846670 100644
--- a/sys/arch/mvme68k/include/param.h
+++ b/sys/arch/mvme68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.7 2000/01/06 03:21:43 smurph Exp $ */
+/*	$OpenBSD: param.h,v 1.8 2000/02/22 19:27:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -106,6 +106,8 @@
 #endif
 #endif
 
+#define MSGBUFSIZE	4096
+
 /*
  * Size of kernel malloc arena in CLBYTES-sized logical pages
  */ 
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 6cde1e3e49e..101d54be691 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.31 2000/01/06 03:21:43 smurph Exp $ */
+/*	$OpenBSD: machdep.c,v 1.32 2000/02/22 19:27:54 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -137,7 +137,6 @@ int   bufpages = BUFPAGES;
 #else
 int   bufpages = 0;
 #endif
-int   msgbufmapped;		/* set when safe to use msgbuf */
 int   maxmem;			/* max memory per process */
 int   physmem = MAXMEM;	/* max supported memory, changes to actual */
 /*
@@ -258,12 +257,11 @@ cpu_startup()
 	 * Initialize error message buffer (at end of core).
 	 * avail_end was pre-decremented in pmap_bootstrap to compensate.
 	 */
-	for (i = 0; i < btoc(sizeof (struct msgbuf)); i++)
+	for (i = 0; i < btoc(MSGBUFSIZE); i++)
 		pmap_enter(pmap_kernel(), (vm_offset_t)msgbufp,
-					  avail_end + i * NBPG, VM_PROT_READ|VM_PROT_WRITE,
-					  TRUE, VM_PROT_READ|VM_PROT_WRITE);
-
-	msgbufmapped = 1;
+		    avail_end + i * NBPG, VM_PROT_READ|VM_PROT_WRITE,
+		    TRUE, VM_PROT_READ|VM_PROT_WRITE);
+	initmsgbuf((caddr_t)msgbufp, round_page(MSGBUFSIZE));
 
 	/*
 	 * Good {morning,afternoon,evening,night}.
@@ -802,6 +800,7 @@ dumpconf()
  */
 dumpsys()
 {
+	extern int msgbufmapped;
 
 	msgbufmapped = 0;
 	if (dumpdev == NODEV)
diff --git a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
index 9383afedf7b..fc09967e427 100644
--- a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
+++ b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_bootstrap.c,v 1.4 2000/01/06 03:21:43 smurph Exp $ */
+/*	$OpenBSD: pmap_bootstrap.c,v 1.5 2000/02/22 19:27:54 deraadt Exp $ */
 
 /* 
  * Copyright (c) 1995 Theo de Raadt
@@ -103,7 +103,6 @@ extern int protection_codes[];
  *	msgbufp:	kernel message buffer
  */
 caddr_t     CADDR1, CADDR2, vmmap, ledbase;
-struct msgbuf  *msgbufp;
 #define ETHERPAGES 16
 void  *etherbuf;
 int   etherlen;
@@ -400,7 +399,7 @@ register vm_offset_t firstpa;
 	RELOC(avail_start, vm_offset_t) = nextpa;
 	RELOC(avail_end, vm_offset_t) = m68k_ptob(RELOC(maxmem, int))
 	   /* XXX allow for msgbuf */
-	   - m68k_round_page(sizeof(struct msgbuf));
+	   - m68k_round_page(MSGBUFSIZE);
 	RELOC(mem_size, vm_size_t) = m68k_ptob(RELOC(physmem, int));
 	RELOC(virtual_avail, vm_offset_t) =
 	VM_MIN_KERNEL_ADDRESS + (nextpa - firstpa);
@@ -475,7 +474,7 @@ register vm_offset_t firstpa;
 		RELOC(ledbase, caddr_t) = (caddr_t)va;
 		va += NBPG;
 		RELOC(msgbufp, struct msgbuf *) = (struct msgbuf *)va;
-		va += NBPG;
+		va += MSGBUFSIZE;
 		RELOC(virtual_avail, vm_offset_t) = va;
 	}
 }