diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/alpha/mem.c | 6 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/dev/bus_dma.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/include/param.h | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/cfb.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/tc/sfb.c | 4 |
6 files changed, 12 insertions, 18 deletions
diff --git a/sys/arch/alpha/alpha/mem.c b/sys/arch/alpha/alpha/mem.c index d6976678229..f2d6b80fe8a 100644 --- a/sys/arch/alpha/alpha/mem.c +++ b/sys/arch/alpha/alpha/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.19 2003/08/15 20:32:12 tedu Exp $ */ +/* $OpenBSD: mem.c,v 1.20 2005/10/28 19:10:26 martin Exp $ */ /* $NetBSD: mem.c,v 1.26 2000/03/29 03:48:20 simonb Exp $ */ /* @@ -235,7 +235,7 @@ mmmmap(dev, off, prot) */ if ((prot & alpha_pa_access(atop(off))) != prot) return (-1); - return (alpha_btop(off)); + return (atop(off)); #ifdef APERTURE case 4: @@ -244,7 +244,7 @@ mmmmap(dev, off, prot) case 1: if ((prot & alpha_pa_access(atop(off))) != prot) return (-1); - return alpha_btop(off); + return atop(off); default: return -1; } diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c index 484eb661c93..508a8e97f28 100644 --- a/sys/arch/alpha/alpha/pmap.c +++ b/sys/arch/alpha/alpha/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.42 2004/06/13 21:49:11 niklas Exp $ */ +/* $OpenBSD: pmap.c,v 1.43 2005/10/28 19:10:26 martin Exp $ */ /* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */ /*- @@ -2546,7 +2546,7 @@ paddr_t pmap_phys_address(int ppn) { - return (alpha_ptob(ppn)); + return (ptoa(ppn)); } /* diff --git a/sys/arch/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c index e29526e7afb..41e385dfc14 100644 --- a/sys/arch/alpha/dev/bus_dma.c +++ b/sys/arch/alpha/dev/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.14 2004/12/25 23:02:23 miod Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.15 2005/10/28 19:10:26 martin Exp $ */ /* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */ /*- @@ -669,7 +669,7 @@ _bus_dmamem_mmap(t, segs, nsegs, off, prot, flags) continue; } - return (alpha_btop((caddr_t)segs[i].ds_addr + off)); + return (atop(segs[i].ds_addr + off)); } /* Page not found. */ diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h index b21a85562fd..7a4b78ecfdf 100644 --- a/sys/arch/alpha/include/param.h +++ b/sys/arch/alpha/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.27 2005/10/21 11:10:06 martin Exp $ */ +/* $OpenBSD: param.h,v 1.28 2005/10/28 19:10:26 martin Exp $ */ /* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */ /* @@ -136,12 +136,6 @@ */ #define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE/DEV_BSIZE)) -/* - * Mach derived conversion macros - */ -#define alpha_btop(x) ((unsigned long)(x) >> PGSHIFT) -#define alpha_ptob(x) ((unsigned long)(x) << PGSHIFT) - #ifdef _KERNEL #ifndef _LOCORE diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c index a6b01de3e4b..dc4e0955d65 100644 --- a/sys/arch/alpha/tc/cfb.c +++ b/sys/arch/alpha/tc/cfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfb.c,v 1.14 2002/03/14 03:15:51 millert Exp $ */ +/* $OpenBSD: cfb.c,v 1.15 2005/10/28 19:10:26 martin Exp $ */ /* $NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $ */ /* @@ -314,7 +314,7 @@ cfbmmap(v, offset, prot) if (offset > CFB_SIZE) return (-1); - return alpha_btop(sc->sc_dc->dc_paddr + offset); + return atop(sc->sc_dc->dc_paddr + offset); } int diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c index 5cd3fbc0021..872f2cd82e2 100644 --- a/sys/arch/alpha/tc/sfb.c +++ b/sys/arch/alpha/tc/sfb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sfb.c,v 1.14 2002/03/14 03:15:51 millert Exp $ */ +/* $OpenBSD: sfb.c,v 1.15 2005/10/28 19:10:26 martin Exp $ */ /* $NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $ */ /* @@ -359,7 +359,7 @@ sfbmmap(v, offset, prot) if (offset >= SFB_SIZE || offset < 0) return (-1); - return alpha_btop(sc->sc_dc->dc_paddr + offset); + return atop(sc->sc_dc->dc_paddr + offset); } int |