summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-05-30 20:35:44 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-05-30 20:35:44 +0000
commitf3123b2b185d927dbb908270082db13d0fb1cce5 (patch)
tree4ef69e980e5b5716a3dc1346a98d38d7bdb02975
parent35c750c1b9b4ff0097fbf2af4700176902c92f5a (diff)
Define msgbuf area size better, gets rid of occasionnal noise in dmesg
ouptput.
-rw-r--r--sys/arch/sun3/include/param.h5
-rw-r--r--sys/arch/sun3/sun3/sun3_startup.c28
2 files changed, 11 insertions, 22 deletions
diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h
index 6d23941a3ad..ecc998cc2a4 100644
--- a/sys/arch/sun3/include/param.h
+++ b/sys/arch/sun3/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.24 2001/05/13 02:37:30 millert Exp $ */
+/* $OpenBSD: param.h,v 1.25 2001/05/30 20:35:39 miod Exp $ */
/* $NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $ */
/*
@@ -94,7 +94,8 @@
#endif
#endif
-#define MSGBUFSIZE (NBPG >> 1)
+#define MSGBUFOFF 0x200
+#define MSGBUFSIZE (NBPG - MSGBUFOFF)
/*
* Size of kernel malloc arena in logical pages
diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c
index a723c83e49b..05a76c1fbfc 100644
--- a/sys/arch/sun3/sun3/sun3_startup.c
+++ b/sys/arch/sun3/sun3/sun3_startup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sun3_startup.c,v 1.14 2000/06/29 02:25:30 miod Exp $ */
+/* $OpenBSD: sun3_startup.c,v 1.15 2001/05/30 20:35:43 miod Exp $ */
/* $NetBSD: sun3_startup.c,v 1.55 1996/11/20 18:57:38 gwr Exp $ */
/*-
@@ -143,7 +143,8 @@ high_segment_alloc(npages)
/*
* Prepare for running the PROM monitor
*/
-static void sun3_mode_monitor()
+static void
+sun3_mode_monitor()
{
/* Install PROM vector table and enable NMI clock. */
/* XXX - Disable watchdog action? */
@@ -206,7 +207,7 @@ sun3_mon_halt()
/*NOTREACHED*/
}
-void
+__dead void
sun3_mon_reboot(bootstring)
char *bootstring;
{
@@ -421,8 +422,8 @@ sun3_vm_init(kehp)
pte |= PG_NC;
set_pte(va, pte);
/* offset by half a page to avoid PROM scribbles */
- msgbufp = (struct msgbuf *)(va + (NBPG >> 1));
- initmsgbuf((caddr_t)msgbufp, round_page(MSGBUFSIZE));
+ msgbufp = (struct msgbuf *)(va + MSGBUFOFF);
+ initmsgbuf((caddr_t)msgbufp, MSGBUFSIZE);
/*
* Virtual and physical pages for proc[0] u-area (already mapped)
@@ -431,19 +432,6 @@ sun3_vm_init(kehp)
proc0_user_pa = avail_start;
virtual_avail += UPAGES*NBPG;
avail_start += UPAGES*NBPG;
-#if 0
- /* Make them non-cached.
- * XXX - Make these non-cached at their full-time mapping address.
- * XXX - Still need to do that? -gwr
- */
- va = (vm_offset_t) proc0paddr;
- while (va < virtual_avail) {
- pte = get_pte(va);
- pte |= PG_NC;
- set_pte(va, pte);
- va += NBPG;
- }
-#endif
/*
* Virtual and physical page used by dumpsys()
@@ -737,8 +725,8 @@ tracedump(x1)
*/
void
v_handler(addr, str)
-int addr;
-char *str;
+ int addr;
+ char *str;
{
switch (*str) {