Let those compile.

2 files changed, 23 insertions, 16 deletions

diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c
index 42291cd0871..0e37cf8e7b7 100644
--- a/sys/arch/mvme88k/mvme88k/pmap.c
+++ b/sys/arch/mvme88k/mvme88k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.42 2001/11/06 19:53:15 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.43 2001/11/07 22:32:29 miod Exp $	*/
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -185,9 +185,9 @@ char  *pmap_modify_list;
 
 #define PV_ENTRY_NULL	((pv_entry_t) 0)
 
-static struct simplelock *pv_lock_table; /* array */
+struct simplelock *pv_lock_table; /* array */
 
-static pv_entry_t pv_head_table; /* array of entries, one per page */
+pv_entry_t pv_head_table; /* array of entries, one per page */
 
 #define	PMAP_MANAGED(pa) (pmap_initialized &&			\
 			 vm_physseg_find(atop((pa)), NULL) != -1)
@@ -302,8 +302,8 @@ boolean_t   pmap_initialized = FALSE;/* Has pmap_init completed? */
 
 #ifdef DEBUG
 
-static void check_pv_list __P((vm_offset_t, pv_entry_t, char *));
-static void check_pmap_consistency __P((char *));
+void check_pv_list __P((vm_offset_t, pv_entry_t, char *));
+void check_pmap_consistency __P((char *));
 
    #define CHECK_PV_LIST(phys,pv_h,who) \
 	if (pmap_con_dbg & CD_CHKPV) check_pv_list(phys,pv_h,who)
@@ -337,9 +337,11 @@ void pmap_remove_range __P((pmap_t, vm_offset_t, vm_offset_t));
 void pmap_copy_on_write __P((vm_offset_t));
 void pmap_expand __P((pmap_t, vm_offset_t));
 void cache_flush_loop __P((int, vm_offset_t, int));
+void pmap_pinit __P((pmap_t));
+void pmap_release __P((pmap_t));
 
 /*
- * Rooutine:	FLUSH_ATC_ENTRY
+ * Routine:	FLUSH_ATC_ENTRY
  *
  * Function:
  *	Flush atc(TLB) which maps given virtual address, in the CPUs which
@@ -1186,17 +1188,17 @@ pmap_bootstrap(vm_offset_t load_start,
 	v = (c)virt; \
     	if ((p = pmap_pte(kernel_pmap, virt)) == PT_ENTRY_NULL) \
     		pmap_expand_kmap(virt, (VM_PROT_READ|VM_PROT_WRITE)|(CACHE_GLOBAL << 16)); \
-	virt += ((n)*NBPG); \
+	virt += ((n) * PAGE_SIZE); \
 })
 
 	virt = *virt_start;
 
-	SYSMAP(caddr_t, vmpte , vmmap, 1);
-	SYSMAP(struct msgbuf *, msgbufmap ,msgbufp, btoc(MSGBUFSIZE));
-
+	SYSMAP(caddr_t, vmpte, vmmap, 1);
 	vmpte->pfn = -1;
 	vmpte->dtype = DT_INVALID;
 
+	SYSMAP(struct msgbuf *, msgbufmap, msgbufp, btoc(MSGBUFSIZE));
+
 	*virt_start = virt;
 
 	/*
diff --git a/sys/arch/mvme88k/mvme88k/trap.c b/sys/arch/mvme88k/mvme88k/trap.c
index afb48847df2..0cad1b68667 100644
--- a/sys/arch/mvme88k/mvme88k/trap.c
+++ b/sys/arch/mvme88k/mvme88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.24 2001/11/06 19:53:15 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.25 2001/11/07 22:32:29 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -1542,20 +1542,25 @@ m197_syscall(register_t code, struct m88100_saved_state *tf)
  * and do normal return-to-user-mode stuff.
  */
 void
-child_return(struct proc *p)
+child_return(arg)
+	void *arg;
 {
+	struct proc *p = arg;
 	struct trapframe *tf;
 
 	tf = USER_REGS(p);
 	tf->r[2] = 0;
 	tf->r[3] = 0;
 	tf->epsr &= ~PSR_C;
-	if (cputyp != CPU_197) {
-		tf->snip = tf->sfip & ~3;
-		tf->sfip = tf->snip + 4;
-	} else {
+#ifdef MVME197
+	if (cputyp == CPU_197) {
 		tf->sxip += 8;
 		tf->sxip &= ~3;
+	} else
+#endif
+	{
+		tf->snip = tf->sfip & ~3;
+		tf->sfip = tf->snip + 4;
 	}
 
 	userret(p, tf, p->p_sticks);