enlarge msgbuf, somewhat line netbsd did

3 files changed, 13 insertions, 11 deletions

diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h
index aab7bff3cc4..20de45cd71c 100644
--- a/sys/arch/mvme88k/include/param.h
+++ b/sys/arch/mvme88k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.10 1999/09/27 20:46:18 smurph Exp $ */
+/*	$OpenBSD: param.h,v 1.11 2000/02/22 19:27:55 deraadt Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1988 University of Utah.
@@ -40,7 +40,7 @@
  * from: Utah $Hdr: machparam.h 1.11 89/08/14$
  *
  *	@(#)param.h	7.8 (Berkeley) 6/28/91
- *	$Id: param.h,v 1.10 1999/09/27 20:46:18 smurph Exp $
+ *	$Id: param.h,v 1.11 2000/02/22 19:27:55 deraadt Exp $
  */
 #ifndef _MACHINE_PARAM_H_
 #define _MACHINE_PARAM_H_
@@ -133,6 +133,8 @@
 #define  NKMEMCLUSTERS        (4096*1024/CLBYTES)
 #endif
 
+#define MSGBUFSIZE	4096
+
 /* pages ("clicks") to disk blocks */
 #define  ctod(x)              ((x)<<(PGSHIFT-DEV_BSHIFT))
 #define  dtoc(x)              ((x)>>(PGSHIFT-DEV_BSHIFT))
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 50cf804b303..700140a76ba 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.18 1999/12/08 06:50:16 itojun Exp $	*/
+/* $OpenBSD: machdep.c,v 1.19 2000/02/22 19:27:55 deraadt Exp $	*/
 /*
  * Copyright (c) 1998, 1999 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -157,7 +157,6 @@ volatile vm_offset_t extiova;
 int physmem;      /* available physical memory, in pages */
 int cold;         /* boot process flag */
 vm_offset_t avail_end, avail_start, avail_next;
-int msgbufmapped = 0;
 int foodebug = 0;    /* for size_memory() */
 int longformat = 1;  /* for regdump() */
 int BugWorks = 0;
@@ -461,12 +460,11 @@ cpu_startup()
     * avail_end was pre-decremented in mvme_bootstrap().
     */
 
-   for (i = 0; i < btoc(sizeof(struct msgbuf)); i++)
+   for (i = 0; i < btoc(MSGBUFSIZE); i++)
       pmap_enter(kernel_pmap, (vm_offset_t)msgbufp,
-			avail_end + i * NBPG, VM_PROT_READ|VM_PROT_WRITE,
-			VM_PROT_READ|VM_PROT_WRITE, TRUE);
-
-   msgbufmapped = 1;
+	avail_end + i * NBPG, VM_PROT_READ|VM_PROT_WRITE,
+	VM_PROT_READ|VM_PROT_WRITE, TRUE);
+   initmsgbuf((caddr_t)msgbufp, round_page(MSGBUFSIZE));
 
    printf("real mem  = %d\n", ctob(physmem));
 
@@ -1160,6 +1158,8 @@ dumpconf()
  */
 dumpsys()
 {
+   extern int msgbufmapped;
+
    msgbufmapped = 0;
    if (dumpdev == NODEV)
       return;
diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c
index 08c1fb8991b..cc715bbd65e 100644
--- a/sys/arch/mvme88k/mvme88k/pmap.c
+++ b/sys/arch/mvme88k/mvme88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.12 1999/09/27 19:13:23 smurph Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.13 2000/02/22 19:27:56 deraadt Exp $	*/
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -1344,7 +1344,7 @@ pmap_bootstrap(vm_offset_t load_start, /* IN */
    virt = *virt_start;
 
    SYSMAP(caddr_t, vmpte , vmmap, 1);
-   SYSMAP(struct msgbuf *, msgbufmap ,msgbufp, 1);
+   SYSMAP(struct msgbuf *, msgbufmap ,msgbufp, btoc(MSGBUFSIZE));
 
    vmpte->pfn = -1;
    vmpte->dtype = DT_INVALID;