diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2005-11-28 20:13:09 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2005-11-28 20:13:09 +0000 |
| commit | f83c1cf25bb3a80ca34369ae85e1bf422d86c55e (patch) | |
| tree | f9a60f55bb3fb72358f3bae3cca14deb3d8054d9 /sys | |
| parent | 41690fd4c9e3ce5618511a4f6fad32c9ec4c1b22 (diff) | |
use atop(), remove last traces of Mach macros from hppa and hppa64
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/dev/mem.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/include/param.h | 8 | ||||
| -rw-r--r-- | sys/arch/hppa64/dev/mem.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa64/include/param.h | 8 |
4 files changed, 6 insertions, 18 deletions
diff --git a/sys/arch/hppa/dev/mem.c b/sys/arch/hppa/dev/mem.c index c61f76a7329..23dcbd22d93 100644 --- a/sys/arch/hppa/dev/mem.c +++ b/sys/arch/hppa/dev/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.26 2004/09/19 01:30:11 mickey Exp $ */ +/* $OpenBSD: mem.c,v 1.27 2005/11/28 20:13:08 martin Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -416,7 +416,7 @@ mmmmap(dev, off, prot) off >= ctob(lastusablepage + 1)) return (-1); #endif - return (btop(off)); + return (atop(off)); } int diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h index 6667d2e66f4..705d94261ef 100644 --- a/sys/arch/hppa/include/param.h +++ b/sys/arch/hppa/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.27 2005/10/26 18:35:44 martin Exp $ */ +/* $OpenBSD: param.h,v 1.28 2005/11/28 20:13:08 martin Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -109,12 +109,6 @@ */ #define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE/DEV_BSIZE)) -/* - * Mach derived conversion macros - */ -#define btop(x) ((unsigned long)(x) >> PGSHIFT) -#define ptob(x) ((unsigned long)(x) << PGSHIFT) - #ifdef _KERNEL #ifdef COMPAT_HPUX /* diff --git a/sys/arch/hppa64/dev/mem.c b/sys/arch/hppa64/dev/mem.c index 484a94c6ab5..d6c0eb17138 100644 --- a/sys/arch/hppa64/dev/mem.c +++ b/sys/arch/hppa64/dev/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.2 2005/05/22 01:38:09 mickey Exp $ */ +/* $OpenBSD: mem.c,v 1.3 2005/11/28 20:13:08 martin Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -257,7 +257,7 @@ mmmmap(dev, off, prot) off >= ctob(lastusablepage + 1)) return (-1); #endif - return (btop(off)); + return (atop(off)); } int diff --git a/sys/arch/hppa64/include/param.h b/sys/arch/hppa64/include/param.h index f17536782e4..e9464489e7d 100644 --- a/sys/arch/hppa64/include/param.h +++ b/sys/arch/hppa64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.4 2005/10/26 18:35:45 martin Exp $ */ +/* $OpenBSD: param.h,v 1.5 2005/11/28 20:13:08 martin Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -108,12 +108,6 @@ */ #define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE/DEV_BSIZE)) -/* - * Mach derived conversion macros - */ -#define btop(x) ((unsigned long)(x) >> PAGE_SHIFT) -#define ptob(x) ((unsigned long)(x) << PAGE_SHIFT) - #ifndef _LOCORE #define CONADDR conaddr #define CONUNIT conunit |