diff options
Diffstat (limited to 'sys/arch/amd64/include')
| -rw-r--r-- | sys/arch/amd64/include/param.h | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/include/pmap.h | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h index b0cd6e3a805..40a703b9693 100644 --- a/sys/arch/amd64/include/param.h +++ b/sys/arch/amd64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.7 2005/10/21 18:55:00 martin Exp $ */ +/* $OpenBSD: param.h,v 1.8 2005/10/26 18:46:07 martin Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -153,9 +153,5 @@ #define x86_trunc_pdr(x) ((unsigned long)(x) & ~(NBPD_L2 - 1)) #define x86_btod(x) ((unsigned long)(x) >> L2_SHIFT) #define x86_dtob(x) ((unsigned long)(x) << L2_SHIFT) -#define x86_btop(x) ((unsigned long)(x) >> PGSHIFT) -#define x86_ptob(x) ((unsigned long)(x) << PGSHIFT) -#define btop(x) x86_btop(x) -#define ptob(x) x86_ptob(x) #define round_pdr(x) x86_round_pdr(x) diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h index e7d9b7a74f1..90a1f519f88 100644 --- a/sys/arch/amd64/include/pmap.h +++ b/sys/arch/amd64/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.8 2005/07/12 21:18:11 hshoexer Exp $ */ +/* $OpenBSD: pmap.h,v 1.9 2005/10/26 18:46:07 martin Exp $ */ /* $NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */ /* @@ -391,7 +391,7 @@ extern pd_entry_t *pdes[]; #define pmap_is_modified(pg) pmap_test_attrs(pg, PG_M) #define pmap_is_referenced(pg) pmap_test_attrs(pg, PG_U) #define pmap_move(DP,SP,D,L,S) -#define pmap_phys_address(ppn) 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 */ |