diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mvme68k/dev/flash.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/dev/nvram.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvme68k/dev/sram.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/dev/vmel.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/dev/vmes.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/mem.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/pmap_bootstrap.c | 10 |
7 files changed, 19 insertions, 17 deletions
diff --git a/sys/arch/mvme68k/dev/flash.c b/sys/arch/mvme68k/dev/flash.c index fedb067a285..3dfa7a22d56 100644 --- a/sys/arch/mvme68k/dev/flash.c +++ b/sys/arch/mvme68k/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.14 2004/07/03 14:36:34 miod Exp $ */ +/* $OpenBSD: flash.c,v 1.15 2005/10/27 16:04:08 martin Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -488,5 +488,5 @@ flashmmap(dev, off, prot) /* allow access only in RAM */ if (off < 0 || off > sc->sc_len) return (-1); - return (m68k_btop(sc->sc_paddr + off)); + return (atop(sc->sc_paddr + off)); } diff --git a/sys/arch/mvme68k/dev/nvram.c b/sys/arch/mvme68k/dev/nvram.c index de60a8e32de..fa8db67ccf5 100644 --- a/sys/arch/mvme68k/dev/nvram.c +++ b/sys/arch/mvme68k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.14 2004/07/02 18:00:50 miod Exp $ */ +/* $OpenBSD: nvram.c,v 1.15 2005/10/27 16:04:08 martin Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -42,6 +42,8 @@ #include <machine/mioctl.h> #include <machine/psl.h> +#include <uvm/uvm_extern.h> + #include <mvme68k/dev/memdevs.h> #include <mvme68k/dev/nvramreg.h> @@ -417,5 +419,5 @@ nvrammmap(dev, off, prot) /* allow access only in RAM */ if (off < 0 || off > sc->sc_len) return (-1); - return (m68k_btop(sc->sc_paddr + off)); + return (atop(sc->sc_paddr + off)); } diff --git a/sys/arch/mvme68k/dev/sram.c b/sys/arch/mvme68k/dev/sram.c index 6008c82b6e7..871a4f19dc0 100644 --- a/sys/arch/mvme68k/dev/sram.c +++ b/sys/arch/mvme68k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.14 2004/07/02 18:00:50 miod Exp $ */ +/* $OpenBSD: sram.c,v 1.15 2005/10/27 16:04:08 martin Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -218,5 +218,5 @@ srammmap(dev, off, prot) /* allow access only in RAM */ if (off < 0 || off > sc->sc_len) return (-1); - return (m68k_btop(sc->sc_paddr + off)); + return (atop(sc->sc_paddr + off)); } diff --git a/sys/arch/mvme68k/dev/vmel.c b/sys/arch/mvme68k/dev/vmel.c index c79d20e2589..b4b8af222ac 100644 --- a/sys/arch/mvme68k/dev/vmel.c +++ b/sys/arch/mvme68k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.12 2004/01/14 20:50:48 miod Exp $ */ +/* $OpenBSD: vmel.c,v 1.13 2005/10/27 16:04:08 martin Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -170,5 +170,5 @@ vmelmmap(dev, off, prot) #endif if (pa == NULL) return (-1); - return (m68k_btop(pa)); + return (atop(pa)); } diff --git a/sys/arch/mvme68k/dev/vmes.c b/sys/arch/mvme68k/dev/vmes.c index c78a55aad53..375c3adcf98 100644 --- a/sys/arch/mvme68k/dev/vmes.c +++ b/sys/arch/mvme68k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.12 2004/01/14 20:50:48 miod Exp $ */ +/* $OpenBSD: vmes.c,v 1.13 2005/10/27 16:04:08 martin Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -167,5 +167,5 @@ vmesmmap(dev, off, prot) pa = vmepmap(sc->sc_vme, (void *)(int)off, NBPG, BUS_VMES); if (pa == NULL) return (-1); - return (m68k_btop(pa)); + return (atop(pa)); } diff --git a/sys/arch/mvme68k/mvme68k/mem.c b/sys/arch/mvme68k/mvme68k/mem.c index 0bddbb0fe1b..688222b99e9 100644 --- a/sys/arch/mvme68k/mvme68k/mem.c +++ b/sys/arch/mvme68k/mvme68k/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.21 2003/06/02 23:27:51 millert Exp $ */ +/* $OpenBSD: mem.c,v 1.22 2005/10/27 16:04:08 martin Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -249,7 +249,7 @@ mmmmap(dev, off, prot) if ((unsigned)off < lowram || (unsigned)off >= 0xFFFFFFFC || (unsigned)off < NBPG) return (-1); - return (m68k_btop(off)); + return (atop(off)); } /*ARGSUSED*/ diff --git a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c index 346e3d33e88..df7f3074fea 100644 --- a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c +++ b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_bootstrap.c,v 1.19 2004/12/30 21:22:20 miod Exp $ */ +/* $OpenBSD: pmap_bootstrap.c,v 1.20 2005/10/27 16:04:08 martin Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -95,7 +95,7 @@ do { \ #define PMAP_MD_MAPIOSPACE() \ do { \ - pte = &((u_int *)kptpa)[m68k_btop(etherbuf)]; \ + pte = &((u_int *)kptpa)[atop(etherbuf)]; \ epte = pte + ETHERPAGES; \ while (pte < epte) { \ *pte = (*pte & ~PG_CMASK) | PG_CIS | PG_U; \ @@ -120,8 +120,8 @@ do { \ #define PMAP_MD_MEMSIZE() \ do { \ - RELOC(avail_end, paddr_t) = m68k_ptob(RELOC(maxmem, int)) - \ - (round_page(MSGBUFSIZE) + m68k_ptob(1)); \ + RELOC(avail_end, paddr_t) = ptoa(RELOC(maxmem, int)) - \ + (round_page(MSGBUFSIZE) + ptoa(1)); \ } while (0) #define PMAP_MD_RELOC3() /* nothing */ @@ -138,7 +138,7 @@ pmap_init_md() * pmap_bootstrap(). */ addr = (vaddr_t) intiobase; - if (uvm_map(kernel_map, &addr, m68k_ptob(iiomapsize+EIOMAPSIZE), + if (uvm_map(kernel_map, &addr, ptoa(iiomapsize+EIOMAPSIZE), NULL, UVM_UNKNOWN_OFFSET, 0, UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE, UVM_ADV_RANDOM, UVM_FLAG_FIXED))) |