summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include
diff options
context:
space:
mode:
authorMartin Reindl <martin@cvs.openbsd.org>2005-11-14 23:50:27 +0000
committerMartin Reindl <martin@cvs.openbsd.org>2005-11-14 23:50:27 +0000
commit9ab4e89a14040a099a6de5262366458448042416 (patch)
tree49087cf9daeed1b07980a1a4d2aab55c003f0edb /sys/arch/i386/include
parent7aac1b583be8701bb74e6346189f8dae98dbf58c (diff)
convert and remove the last traces of i386_round_page(),
i386_trunc_page(), i386_btop() and i386_ptob()
Diffstat (limited to 'sys/arch/i386/include')
-rw-r--r--sys/arch/i386/include/param.h6
-rw-r--r--sys/arch/i386/include/pmap.h12
2 files changed, 7 insertions, 11 deletions
diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index 001d7ac1e3f..d0dbf627058 100644
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.30 2005/07/31 15:31:13 miod Exp $ */
+/* $OpenBSD: param.h,v 1.31 2005/11/14 23:50:26 martin Exp $ */
/* $NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $ */
/*-
@@ -148,7 +148,3 @@
#define i386_trunc_pdr(x) ((unsigned)(x) & ~PDOFSET)
#define i386_btod(x) ((unsigned)(x) >> PDSHIFT)
#define i386_dtob(x) ((unsigned)(x) << PDSHIFT)
-#define i386_round_page(x) ((((unsigned)(x)) + PGOFSET) & ~PGOFSET)
-#define i386_trunc_page(x) ((unsigned)(x) & ~PGOFSET)
-#define i386_btop(x) ((unsigned)(x) >> PGSHIFT)
-#define i386_ptob(x) ((unsigned)(x) << PGSHIFT)
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index 9ffdf455622..7f9c32fad35 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.37 2004/12/14 16:57:22 hshoexer Exp $ */
+/* $OpenBSD: pmap.h,v 1.38 2005/11/14 23:50:26 martin Exp $ */
/* $NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $ */
/*
@@ -197,13 +197,13 @@
* plus alternative versions of the above
*/
-#define vtopte(VA) (PTE_BASE + i386_btop(VA))
+#define vtopte(VA) (PTE_BASE + atop(VA))
#define kvtopte(VA) vtopte(VA)
-#define ptetov(PT) (i386_ptob(PT - PTE_BASE))
+#define ptetov(PT) (ptoa(PT - PTE_BASE))
#define vtophys(VA) ((*vtopte(VA) & PG_FRAME) | \
((unsigned)(VA) & ~PG_FRAME))
-#define avtopte(VA) (APTE_BASE + i386_btop(VA))
-#define ptetoav(PT) (i386_ptob(PT - APTE_BASE))
+#define avtopte(VA) (APTE_BASE + atop(VA))
+#define ptetoav(PT) (ptoa(PT - APTE_BASE))
#define avtophys(VA) ((*avtopte(VA) & PG_FRAME) | \
((unsigned)(VA) & ~PG_FRAME))
@@ -362,7 +362,7 @@ extern int pmap_pg_g; /* do we support PG_G? */
#define pmap_copy(DP,SP,D,L,S)
#define pmap_is_modified(pg) pmap_test_attrs(pg, PG_M)
#define pmap_is_referenced(pg) pmap_test_attrs(pg, PG_U)
-#define pmap_phys_address(ppn) i386_ptob(ppn)
+#define pmap_phys_address(ppn) ptoa(ppn)
#define pmap_valid_entry(E) ((E) & PG_V) /* is PDE or PTE valid? */
#define pmap_proc_iflush(p,va,len) /* nothing */