diff options
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/mvme68k/dev/if_ie.c | 8 | ||||
-rw-r--r-- | sys/arch/mvme68k/mvme68k/pmap.c | 4 | ||||
-rw-r--r-- | sys/arch/mvme68k/mvme68k/sys_machdep.c | 5 | ||||
-rw-r--r-- | sys/arch/mvme68k/mvme68k/vm_machdep.c | 6 |
4 files changed, 12 insertions, 11 deletions
diff --git a/sys/arch/mvme68k/dev/if_ie.c b/sys/arch/mvme68k/dev/if_ie.c index 52ac91b4309..4f74ffb0358 100644 --- a/sys/arch/mvme68k/dev/if_ie.c +++ b/sys/arch/mvme68k/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.13 2001/06/08 08:09:06 art Exp $ */ +/* $OpenBSD: if_ie.c,v 1.14 2001/06/10 14:54:42 miod Exp $ */ /*- * Copyright (c) 1999 Steve Murphree, Jr. @@ -362,7 +362,7 @@ ie_obreset(sc) ieo->portlow = a >> 16; delay(1000); - pmap_extract(pmap_kernel(), sc->scp, &a); + pmap_extract(pmap_kernel(), (vm_offset_t)sc->scp, &a); a |= IE_PORT_NEWSCPADDR; ieo->porthigh = a & 0xffff; t = 0; t = 1; @@ -418,7 +418,7 @@ ieattach(parent, self, aux) /* get the first avaliable etherbuf */ sc->sc_maddr = etherbuf; /* maddr = vaddr */ if (sc->sc_maddr == NULL) panic("ie: too many ethernet boards"); - if (pmap_extract(pmap_kernel(), sc->sc_maddr, &pa) == FALSE) + if (pmap_extract(pmap_kernel(), (vm_offset_t)sc->sc_maddr, &pa) == FALSE) panic("ie: pmap_extract"); sc->sc_iobase = (caddr_t)pa; /* iobase = paddr (24 bit) */ @@ -434,7 +434,7 @@ ieattach(parent, self, aux) /*printf("scpV %x iscpV %x scbV %x\n", sc->scp, sc->iscp, sc->scb);*/ sc->scp->ie_bus_use = 0x44; - pmap_extract(pmap_kernel(), sc->iscp, &pa); + pmap_extract(pmap_kernel(), (vm_offset_t)sc->iscp, &pa); SWT_32(sc->scp->ie_iscp_ptr, pa); /* * rest of first page is unused (wasted!), rest of ram diff --git a/sys/arch/mvme68k/mvme68k/pmap.c b/sys/arch/mvme68k/mvme68k/pmap.c index 698130099d3..c326bfc03c5 100644 --- a/sys/arch/mvme68k/mvme68k/pmap.c +++ b/sys/arch/mvme68k/mvme68k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.20 2001/06/08 08:09:08 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.21 2001/06/10 14:54:45 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -2240,7 +2240,7 @@ pmap_enter_ptpage(pmap, va) register pmap_t pmap; register vm_offset_t va; { - register vm_offset_t ptpa; + vm_offset_t ptpa; register struct pv_entry *pv; #ifdef M68060 u_int stpa; diff --git a/sys/arch/mvme68k/mvme68k/sys_machdep.c b/sys/arch/mvme68k/mvme68k/sys_machdep.c index edd5d7e5179..94d13dbd300 100644 --- a/sys/arch/mvme68k/mvme68k/sys_machdep.c +++ b/sys/arch/mvme68k/mvme68k/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.10 2001/06/08 08:09:09 art Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.11 2001/06/10 14:54:46 miod Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -79,7 +79,8 @@ int len; #if defined(M68040) || defined(M68060) if (mmutype <= MMU_68040) { register int inc = 0; - int pa = 0, doall = 0; + paddr_t pa = 0; + int doall = 0; caddr_t end; #ifdef COMPAT_HPUX extern struct emul emul_hpux; diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c index 2dd2f2da07c..24c2e00e968 100644 --- a/sys/arch/mvme68k/mvme68k/vm_machdep.c +++ b/sys/arch/mvme68k/mvme68k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.23 2001/06/08 08:09:10 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.24 2001/06/10 14:54:46 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -165,7 +165,7 @@ pagemove(from, to, size) caddr_t from, to; size_t size; { - register vm_offset_t pa; + vm_offset_t pa; #ifdef DEBUG if ((size & PAGE_MASK) != 0) @@ -278,7 +278,7 @@ vmapbuf(bp, siz) struct proc *p; int off; vm_offset_t kva; - register vm_offset_t pa; + vm_offset_t pa; if ((flags & B_PHYS) == 0) panic("vmapbuf"); |