From d199669758113aeeaf54b22a5a5829fb27ebfb52 Mon Sep 17 00:00:00 2001
From: Martin Reindl <martin@cvs.openbsd.org>
Date: Mon, 24 Oct 2005 19:07:41 +0000
Subject: Mach-macro free

---
 sys/arch/sparc64/include/param.h   | 7 +------
 sys/arch/sparc64/sparc64/machdep.c | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'sys')

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 $ */
 
 /*
@@ -214,11 +214,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
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. */
-- 
cgit v1.2.3