diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2005-10-24 19:07:41 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2005-10-24 19:07:41 +0000 |
| commit | d199669758113aeeaf54b22a5a5829fb27ebfb52 (patch) | |
| tree | 7eea7deaab00fabd245e0e1553e83475ceb3b31a /sys | |
| parent | 52f7f91977d30819f9d63327961277523929a76c (diff) | |
Mach-macro free
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc64/include/param.h | 7 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/machdep.c | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h index a08ae38c613..5b7e086c192 100644 --- a/sys/arch/sparc64/include/param.h +++ b/sys/arch/sparc64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.18 2005/09/12 23:05:06 miod Exp $ */ +/* $OpenBSD: param.h,v 1.19 2005/10/24 19:07:40 martin Exp $ */ /* $NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */ /* @@ -215,11 +215,6 @@ extern int nbpg, pgofset, pgshift; #define bdbtofsb(bn) ((bn) / (BLKDEV_IOSIZE / DEV_BSIZE)) /* - * Mach derived conversion macros - */ -#define sparc64_btop(x) ((unsigned long)(x) >> PGSHIFT) - -/* * dvmamap manages a range of DVMA addresses intended to create double * mappings of physical memory. In a way, `dvmamap' is a submap of the * VM map `phys_map'. The difference is the use of the `resource map' diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index 8b9261bed53..096204a7852 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.76 2005/07/09 22:51:13 robert Exp $ */ +/* $OpenBSD: machdep.c,v 1.77 2005/10/24 19:07:40 martin Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -1638,7 +1638,7 @@ _bus_dmamem_mmap(t, t0, segs, nsegs, off, prot, flags) continue; } - return (sparc64_btop((caddr_t)segs[i].ds_addr + off)); + return (atop((caddr_t)segs[i].ds_addr + off)); } /* Page not found. */ |