more spacees, includes, protos

8 files changed, 119 insertions, 72 deletions

diff --git a/sys/arch/powerpc/include/autoconf.h b/sys/arch/powerpc/include/autoconf.h
index 94d157d792e..d98451caec8 100644
--- a/sys/arch/powerpc/include/autoconf.h
+++ b/sys/arch/powerpc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.9 2001/06/26 18:19:43 drahn Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.10 2001/07/09 02:14:05 mickey Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -103,7 +103,7 @@ void ofrootfound(void);
 
 typedef int mac_intr_handle_t;
 typedef void     *(intr_establish_t) __P((void *, mac_intr_handle_t,
-            int, int, int (*func)(void *), void *, char *));
+    int, int, int (*func)(void *), void *, char *));
 typedef void     (intr_disestablish_t) __P((void *, void *));
 
 intr_establish_t mac_intr_establish;
diff --git a/sys/arch/powerpc/include/bus.h b/sys/arch/powerpc/include/bus.h
index e716c5878fe..f4441fe23ef 100644
--- a/sys/arch/powerpc/include/bus.h
+++ b/sys/arch/powerpc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.15 2001/06/26 05:17:04 mickey Exp $	*/
+/*	$OpenBSD: bus.h,v 1.16 2001/07/09 02:14:05 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
@@ -317,6 +317,8 @@ bus_space_read_raw_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
 void
 bus_space_read_raw_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
 	bus_addr_t ba, u_int8_t *dst, bus_size_t size);
+#define	bus_space_read_raw_multi_8 \
+    !!! bus_space_read_raw_multi_8 not implemented !!!
 
 void
 bus_space_write_raw_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
@@ -327,11 +329,31 @@ bus_space_write_raw_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
 void
 bus_space_write_raw_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
 	bus_addr_t ba, const u_int8_t *src, bus_size_t size);
+#define	bus_space_write_raw_multi_8 \
+    !!! bus_space_write_raw_multi_8 not implemented !!!
 
-#define	bus_space_read_raw_multi_8 \
-    !!! bus_space_read_raw_multi_8 not implemented !!!
+void
+bus_space_set_region_1 __P((void *v, bus_space_handle_t h, bus_size_t o,
+    u_int8_t val, bus_size_t c));
+void
+bus_space_set_region_2 __P((void *v, bus_space_handle_t h, bus_size_t o,
+    u_int16_t val, bus_size_t c));
+void
+bus_space_set_region_4 __P((void *v, bus_space_handle_t h, bus_size_t o,
+    u_int32_t val, bus_size_t c));
+#define	bus_space_set_region_8 \
+    !!! bus_space_write_raw_multi_8 not implemented !!!
 
-#define	bus_space_write_raw_multi_8 \
+void
+bus_space_copy_1 __P((void *v, bus_space_handle_t h1, bus_space_handle_t h2,
+    bus_size_t o1, bus_size_t o2, bus_size_t c));
+void
+bus_space_copy_2 __P((void *v, bus_space_handle_t h1, bus_space_handle_t h2,
+    bus_size_t o1, bus_size_t o2, bus_size_t c));
+void
+bus_space_copy_4 __P((void *v, bus_space_handle_t h1, bus_space_handle_t h2,
+    bus_size_t o1, bus_size_t o2, bus_size_t c));
+#define	bus_space_copy_8 \
     !!! bus_space_write_raw_multi_8 not implemented !!!
 
 /*
diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h
index 9b01de2be9a..8de202ada69 100644
--- a/sys/arch/powerpc/include/param.h
+++ b/sys/arch/powerpc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.16 2001/07/06 02:07:43 provos Exp $	*/
+/*	$OpenBSD: param.h,v 1.17 2001/07/09 02:14:05 mickey Exp $	*/
 /*	$NetBSD: param.h,v 1.1 1996/09/30 16:34:28 ws Exp $	*/
 
 /*-
@@ -137,6 +137,8 @@
 #define	EMPTY_SEGMENT	0xfffff0
 #define	USER_ADDR	((void *)(USER_SR << ADDR_SR_SHFT))
 
+#define	__COMPAT_OLD_TIMEOUTS
+
 /*
  * Some system constants
  */
diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h
index 0b18a771c49..4fa83a246d5 100644
--- a/sys/arch/powerpc/include/pmap.h
+++ b/sys/arch/powerpc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.10 2001/06/29 06:07:09 drahn Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.11 2001/07/09 02:14:05 mickey Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $	*/
 
 /*-
@@ -96,6 +96,8 @@ int ptebits(paddr_t pa, int bit);
 #define	pmap_is_modified(pa)	 (ptebits((pa), PTE_CHG))
 #define	pmap_is_referenced(pa) (ptebits((pa), PTE_REF))
 #define	pmap_unwire(pm, va)
+/* XXX */
+void pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot);
 #endif
 
 #define	pmap_phys_address(x)		(x)
diff --git a/sys/arch/powerpc/powerpc/db_interface.c b/sys/arch/powerpc/powerpc/db_interface.c
index a9865ae295e..f83bea9a4a9 100644
--- a/sys/arch/powerpc/powerpc/db_interface.c
+++ b/sys/arch/powerpc/powerpc/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.5 2001/07/01 04:34:24 drahn Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.6 2001/07/09 02:14:05 mickey Exp $	*/
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -6,6 +6,9 @@
 
 #include <machine/db_machdep.h>
 #include <ddb/db_extern.h>
+
+int ddb_trap_glue __P((struct trapframe *frame)); /* called from locore */
+
 void
 Debugger()
 {
diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c
index eb2e1c4ba60..27b45f693a5 100644
--- a/sys/arch/powerpc/powerpc/machdep.c
+++ b/sys/arch/powerpc/powerpc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.71 2001/06/27 04:37:21 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.72 2001/07/09 02:14:05 mickey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -71,6 +71,8 @@
 
 #include <dev/ofw/openfirm.h>
 
+#include <dev/pci/pcivar.h>
+
 #include <machine/bat.h>
 #include <machine/pmap.h>
 #include <machine/powerpc.h>
@@ -78,7 +80,12 @@
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/pio.h>
+
 #include "adb.h"
+#if NADB > 0
+#include <arch/powerpc/mac/adbvar.h>
+#include <arch/powerpc/mac/adb_direct.h>
+#endif
 
 #ifdef DDB
 #include <machine/db_machdep.h>
@@ -96,7 +103,7 @@ struct proc *fpuproc;
 
 extern struct user *proc0paddr;
 
-/* 
+/*
  * Declare these as initialized data so we can patch them.
  */
 int	nswbuf = 0;
@@ -140,7 +147,17 @@ void * startsym, *endsym;
 void ofw_dbg(char *str);
 
 caddr_t allocsys __P((caddr_t));
+void dumpsys __P((void));
+void systype __P((char *name));
+void lcsplx __P((int ipl));	/* called from LCore */
 int power4e_get_eth_addr __P((void));
+void nameinterrupt __P((int replace, char *newstr));
+void ppc_intr_setup __P((intr_establish_t *establish,
+    intr_disestablish_t *disestablish));
+void *ppc_intr_establish __P((void *lcv, pci_intr_handle_t ih, int type,
+    int level, int (*func) __P((void *)), void *arg, char *name));
+int bus_mem_add_mapping __P((bus_addr_t bpa, bus_size_t size, int cacheable,
+    bus_space_handle_t *bshp));
 
 /*
  * Extent maps to manage I/O. Allocate storage for 8 regions in each,
@@ -183,7 +200,7 @@ initppc(startkernel, endkernel, args)
 
 	proc0.p_addr = proc0paddr;
 	bzero(proc0.p_addr, sizeof *proc0.p_addr);
-	
+
 	/*
 	 * XXX We use the page just above the interrupt vector as
 	 * message buffer
@@ -192,7 +209,7 @@ initppc(startkernel, endkernel, args)
 
 where = 3;
 	curpcb = &proc0paddr->u_pcb;
-	
+
 	curpm = curpcb->pcb_pmreal = curpcb->pcb_pm = pmap_kernel();
 
 	/*
@@ -207,7 +224,7 @@ where = 3;
 	__asm__ volatile ("mtdbatu 1,%0" :: "r"(0));
 	__asm__ volatile ("mtdbatu 2,%0" :: "r"(0));
 	__asm__ volatile ("mtdbatu 3,%0" :: "r"(0));
-	
+
 	/*
 	 * Set up initial BAT table to only map the lowest 256 MB area
 	 */
@@ -256,7 +273,7 @@ where = 3;
 		      :: "r"(battable[1].batl), "r"(battable[1].batu));
 	__asm__ volatile ("sync;isync");
 #endif
-	
+
 	/*
 	 * Set up trap vectors
 	 */
@@ -298,7 +315,7 @@ where = 3;
 		case EXC_BPT:
 #if defined(DDB)
 			bcopy(&ddblow, (void *)exc, (size_t)&ddbsize);
-#else 
+#else
 #if NIPKDB > 0
 			bcopy(&ipkdblow, (void *)exc, (size_t)&ipkdbsize);
 #endif
@@ -325,12 +342,12 @@ where = 3;
 	__asm__ volatile ("eieio; mfmsr %0; ori %0,%0,%1; mtmsr %0; sync;isync"
 		      : "=r"(scratch) : "K"(PSL_IR|PSL_DR|PSL_ME|PSL_RI));
 
-	/*                                                              
-	 * Look at arguments passed to us and compute boothowto.      
+	/*
+	 * Look at arguments passed to us and compute boothowto.
 	 * Default to SINGLE and ASKNAME if no args or
-	 * SINGLE and DFLTROOT if this is a ramdisk kernel.                     
-	 */                                                               
-#ifdef RAMDISK_HOOKS                                         
+	 * SINGLE and DFLTROOT if this is a ramdisk kernel.
+	 */
+#ifdef RAMDISK_HOOKS
 	boothowto = RB_SINGLE | RB_DFLTROOT;
 #else
 	boothowto = RB_AUTOBOOT;
@@ -364,11 +381,11 @@ where = 3;
 				break;
 			}
 		}
-	}			
+	}
 	bootpath= &bootpathbuf[0];
 #if 0
 	bcopy(args +strlen(args) + 1, &startsym, sizeof(startsym));
-	bcopy(args +strlen(args) + 5, &endsym, sizeof(endsym)); 
+	bcopy(args +strlen(args) + 5, &endsym, sizeof(endsym));
 	ddb_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 #endif
 
@@ -379,13 +396,13 @@ where = 3;
 	/*
 	 * Set up extents for pci mappings
 	 * Is this too late?
-	 * 
+	 *
 	 * what are good start and end values here??
 	 * 0x0 - 0x80000000 mcu bus
 	 * MAP A				MAP B
 	 * 0x80000000 - 0xbfffffff io		0x80000000 - 0xefffffff mem
 	 * 0xc0000000 - 0xffffffff mem		0xf0000000 - 0xffffffff io
-	 * 
+	 *
 	 * of course bsd uses 0xe and 0xf
 	 * So the BSD PPC memory map will look like this
 	 * 0x0 - 0x80000000 memory (whatever is filled)
@@ -400,7 +417,7 @@ where = 3;
 
 	/*
 	 * Now we can set up the console as mapping is enabled.
-         */
+	 */
 	consinit();
 	/* while using openfirmware, run userconfig */
 	if (boothowto & RB_CONFIG) {
@@ -447,11 +464,12 @@ void
 install_extint(handler)
 	void (*handler) __P((void));
 {
-	extern extint, extsize;
+	void extint __P((void));
+	void extsize __P((void));
 	extern u_long extint_call;
 	u_long offset = (u_long)handler - (u_long)&extint_call;
 	int omsr, msr;
-	
+
 #ifdef	DIAGNOSTIC
 	if (offset > 0x1ffffff)
 		panic("install_extint: too far away");
@@ -476,11 +494,11 @@ cpu_startup()
 	vm_offset_t minaddr, maxaddr;
 	int base, residual;
 	v = (caddr_t)proc0paddr + USPACE;
-	
+
 	proc0.p_addr = proc0paddr;
 
 	printf("%s", version);
-	
+
 	printf("real mem = %d\n", ctob(physmem));
 
 	/*
@@ -517,7 +535,7 @@ cpu_startup()
 		vm_size_t curbufsize;
 		vm_offset_t curbuf;
 		struct vm_page *pg;
-		
+
 		curbuf = (vm_offset_t)buffers + i * MAXBSIZE;
 		curbufsize = PAGE_SIZE * (i < residual ? base + 1 : base);
 		while (curbufsize) {
@@ -545,20 +563,19 @@ cpu_startup()
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 	    VM_PHYS_SIZE, TRUE, FALSE, NULL);
 	ppc_malloc_ok = 1;
-	
+
 	mb_map = uvm_km_suballoc(kernel_map, (vm_offset_t *)&mbutl, &maxaddr,
 	    VM_MBUF_SIZE, FALSE, FALSE, NULL);
-	
+
 	/*
 	 * Initialize timeouts.
 	 */
 	timeout_init();
-	
+
 	printf("avail mem = %d\n", ptoa(uvmexp.free));
 	printf("using %d buffers containing %d bytes of memory\n", nbuf,
 	    bufpages * PAGE_SIZE);
-	
-	
+
 	/*
 	 * Set up the buffers.
 	 */
@@ -566,7 +583,6 @@ cpu_startup()
 
 	devio_malloc_safe = 1;
 }
-	
 
 /*
  * Allocate space for system data structures.
@@ -623,7 +639,7 @@ allocsys(v)
 			nswbuf = 256;
 	}
 	valloc(buf, struct buf, nbuf);
-	
+
 	return v;
 }
 
@@ -654,14 +670,14 @@ setregs(p, pack, stack, retval)
 {
 	u_int32_t newstack;
 	u_int32_t pargs;
-	u_int32_t       args[4];
+	u_int32_t args[4];
 
 	struct trapframe *tf = trapframe(p);
 	pargs = -roundup(-stack + 8, 16);
 	newstack = (u_int32_t)(pargs - 32);
 
 	copyin ((void*)(VM_MAX_ADDRESS-0x10), &args, 0x10);
-	
+
 	bzero(tf, sizeof *tf);
 	tf->fixreg[1] = newstack;
 	tf->fixreg[3] = retval[0] = args[1];	/* XXX */
@@ -689,12 +705,12 @@ sendsig(catcher, sig, mask, code, type, val)
 	struct sigframe *fp, frame;
 	struct sigacts *psp = p->p_sigacts;
 	int oldonstack;
-	
+
 	frame.sf_signum = sig;
-	
+
 	tf = trapframe(p);
 	oldonstack = psp->ps_sigstk.ss_flags & SS_ONSTACK;
-	
+
 	/*
 	 * Allocate stack space for signal handler.
 	 */
@@ -707,7 +723,7 @@ sendsig(catcher, sig, mask, code, type, val)
 	} else
 		fp = (struct sigframe *)tf->fixreg[1];
 	fp = (struct sigframe *)((int)(fp - 1) & ~0xf);
-	
+
 	/*
 	 * Generate signal context for SYS_sigreturn.
 	 */
@@ -721,7 +737,7 @@ sendsig(catcher, sig, mask, code, type, val)
 	}
 	if (copyout(&frame, fp, sizeof frame) != 0)
 		sigexit(p, SIGILL);
-	
+
 
 	tf->fixreg[1] = (int)fp;
 	tf->lr = (int)catcher;
@@ -752,8 +768,8 @@ sys_sigreturn(p, v, retval)
 	struct sigcontext sc;
 	struct trapframe *tf;
 	int error;
-	
-	if (error = copyin(SCARG(uap, sigcntxp), &sc, sizeof sc))
+
+	if ((error = copyin(SCARG(uap, sigcntxp), &sc, sizeof sc)))
 		return error;
 	tf = trapframe(p);
 	if ((sc.sc_frame.srr1 & PSL_USERSTATIC) != (tf->srr1 & PSL_USERSTATIC))
@@ -936,10 +952,10 @@ power4e_get_eth_addr()
 				  &ofw_eth_addr, sizeof ofw_eth_addr) >= 0) {
 			return(0);
 		}
-		if (phandle = OF_child(qhandle))
+		if ((phandle = OF_child(qhandle)))
 			continue;
 		while (qhandle) {
-			if (phandle = OF_peer(qhandle))
+			if ((phandle = OF_peer(qhandle)))
 				break;
 			qhandle = OF_parent(qhandle);
 		}
@@ -969,7 +985,7 @@ void
 systype(char *name)
 {
 	/* this table may be order specific if substrings match several
-	 * computers but a longer string matches a specific 
+	 * computers but a longer string matches a specific
 	 */
 	int i;
 	struct systyp {
@@ -999,7 +1015,8 @@ systype(char *name)
 			name);
 	}
 }
-/* 
+
+/*
  * one attempt at interrupt stuff..
  *
  */
@@ -1033,7 +1050,7 @@ ppc_intr_establish(lcv, ih, type, level, func, arg, name)
 	return (void *)ppc_configed_intr_cnt;
 }
 
-intr_establish_t *intr_establish_func = ppc_intr_establish;;
+intr_establish_t *intr_establish_func = (intr_establish_t *)ppc_intr_establish;
 intr_disestablish_t *intr_disestablish_func;
 
 void
@@ -1080,7 +1097,7 @@ bus_space_map(t, bpa, size, cacheable, bshp)
 	bus_space_handle_t *bshp;
 {
 	int error;
-	
+
 	if  (POWERPC_BUS_TAG_BASE(t) == 0) {
 		/* if bus has base of 0 fail. */
 		return 1;
@@ -1097,8 +1114,8 @@ bus_space_map(t, bpa, size, cacheable, bshp)
 			return 0;
 		}
 	}
-	if (error  = bus_mem_add_mapping(bpa, size, cacheable, bshp)) {
-		if (extent_free(devio_ex, bpa, size, EX_NOWAIT | 
+	if ((error  = bus_mem_add_mapping(bpa, size, cacheable, bshp))) {
+		if (extent_free(devio_ex, bpa, size, EX_NOWAIT |
 			(ppc_malloc_ok ? EX_MALLOCOK : 0)))
 		{
 			printf("bus_space_map: pa 0x%x, size 0x%x\n",
@@ -1141,7 +1158,7 @@ bus_space_unmap(t, bsh, size)
 	uvm_km_free_wakeup(phys_map, sva, len);
 #if 0
 	pmap_extract(pmap_kernel(), sva, &bpa);
-	if (extent_free(devio_ex, bpa, size, EX_NOWAIT | 
+	if (extent_free(devio_ex, bpa, size, EX_NOWAIT |
 		(ppc_malloc_ok ? EX_MALLOCOK : 0)))
 	{
 		printf("bus_space_map: pa 0x%x, size 0x%x\n",
@@ -1174,7 +1191,7 @@ bus_mem_add_mapping(bpa, size, cacheable, bshp)
 		panic("bus_mem_add_mapping: overflow");
 	}
 #endif
-	if (ppc_malloc_ok == 0) { 
+	if (ppc_malloc_ok == 0) {
 		bus_size_t alloc_size;
 
 		/* need to steal vm space before kernel vm is initialized */
@@ -1187,7 +1204,7 @@ bus_mem_add_mapping(bpa, size, cacheable, bshp)
 	}
 	*bshp = vaddr + off;
 #ifdef DEBUG_BUS_MEM_ADD_MAPPING
-	printf("mapping %x size %x to %x vbase %x\n", 
+	printf("mapping %x size %x to %x vbase %x\n",
 		bpa, size, *bshp, spa);
 #endif
 	for (; len > 0; len -= NBPG) {
@@ -1210,7 +1227,7 @@ bus_space_alloc(tag, rstart, rend, size, alignment, boundary, cacheable, addrp,
 	bus_size_t size, alignment, boundary;
 	int cacheable;
 	bus_addr_t *addrp;
-        bus_space_handle_t *handlep;
+	bus_space_handle_t *handlep;
 {
 
 	panic("bus_space_alloc: unimplemented");
@@ -1246,7 +1263,7 @@ mapiodev(pa, len)
 	}
 	va = vaddr = uvm_km_valloc(phys_map, size);
 
-	if (va == 0) 
+	if (va == 0)
 		return NULL;
 
 	for (; size > 0; size -= NBPG) {
@@ -1261,7 +1278,7 @@ mapiodev(pa, len)
 	}
 	return (void*) (va+off);
 }
-void 
+void
 unmapiodev(kva, p_size)
 	void *kva;
 	psize_t p_size;
@@ -1295,8 +1312,8 @@ unmapiodev(kva, p_size)
 #define _CONCAT(A,B) A ## B
 #define __C(A,B)	_CONCAT(A,B)
 
-#define BUS_SPACE_COPY_N(BYTES,TYPE) 					\
-void 									\
+#define BUS_SPACE_COPY_N(BYTES,TYPE)					\
+void									\
 __C(bus_space_copy_,BYTES)(v, h1, o1, h2, o2, c)			\
 	void *v;							\
 	bus_space_handle_t h1, h2;					\
@@ -1328,7 +1345,7 @@ __C(bus_space_set_region_,BYTES)(v, h, o, val, c)			\
 	void *v;							\
 	bus_space_handle_t h;						\
 	TYPE val;							\
-	bus_size_t c;							\
+	bus_size_t o, c;						\
 {									\
 	TYPE *dst;							\
 	int i;								\
@@ -1447,6 +1464,7 @@ kcopy(from, to, size)
 
 	return 0;
 }
+
 void
 nameinterrupt(replace, newstr)
 	int replace;
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index 4964e604c64..7938f0fea2d 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.34 2001/06/27 06:19:54 art Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.35 2001/07/09 02:14:05 mickey Exp $	*/
 /*	$NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $	*/
 
 /*
@@ -276,7 +276,6 @@ void pmap_remove_pv(struct pmap *pm, int pteidx, vm_offset_t va,
 pte_t * pte_find(struct pmap *pm, vm_offset_t va);
 
 /* XXX */
-void pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot);
 void pmap_kenter_pgs(vaddr_t va, struct vm_page **pgs, int npgs);
 void pmap_kremove(vaddr_t va, vsize_t len);
 void addbatmap(u_int32_t vaddr, u_int32_t raddr, u_int32_t wimg);
diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c
index 8233e7d1a59..93e7a512dc3 100644
--- a/sys/arch/powerpc/powerpc/vm_machdep.c
+++ b/sys/arch/powerpc/powerpc/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.19 2001/06/29 06:07:09 drahn Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.20 2001/07/09 02:14:06 mickey Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $	*/
 
 /*
@@ -45,6 +45,7 @@
 #include <uvm/uvm_extern.h>
 
 #include <machine/pcb.h>
+#include <machine/fpu.h>
 
 /*
  * Finish a fork operation, with process p2 nearly set up.
@@ -207,13 +208,13 @@ cpu_coredump(p, vp, cred, chdr)
 	cseg.c_addr = 0;
 	cseg.c_size = chdr->c_cpusize;
 
-	if (error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
+	if ((error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&cseg, chdr->c_seghdrsize,
 			    (off_t)chdr->c_hdrsize, UIO_SYSSPACE,
-			    IO_NODELOCKED|IO_UNIT, cred, NULL, p))
+			    IO_NODELOCKED|IO_UNIT, cred, NULL, p)))
 		return error;
-	if (error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof md_core,
-			    (off_t)(chdr->c_hdrsize + chdr->c_seghdrsize), UIO_SYSSPACE,
-			    IO_NODELOCKED|IO_UNIT, cred, NULL, p))
+	if ((error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&md_core, sizeof md_core,
+			    (off_t)(chdr->c_hdrsize + chdr->c_seghdrsize),
+			    UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, NULL, p)))
 		return error;
 
 	chdr->c_nseg++;