diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2005-11-28 16:56:33 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2005-11-28 16:56:33 +0000 |
| commit | b47370ad400d0b9be289bc1cf76230aa90e8abde (patch) | |
| tree | 21ce6b380125676cc6c4688889035a6d4faac66a | |
| parent | 8bdb3eb3e40cede7f693a8754135a664a0072ca5 (diff) | |
- consistently use x86_round_pdr() allowing us to remove the superfluous
round_pdr() macro
- while there remove two more unused Mach macros
| -rw-r--r-- | sys/arch/amd64/amd64/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/include/param.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index d1ff3c53ca0..b1acc509e31 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.13 2005/10/26 18:46:06 martin Exp $ */ +/* $OpenBSD: pmap.c,v 1.14 2005/11/28 16:56:31 martin Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -2759,7 +2759,7 @@ pmap_growkernel(maxkvaddr) if (maxkvaddr <= pmap_maxkvaddr) return pmap_maxkvaddr; - maxkvaddr = round_pdr(maxkvaddr); + maxkvaddr = x86_round_pdr(maxkvaddr); old = nkptp[PTP_LEVELS - 1]; /* * This loop could be optimized more, but pmap_growkernel() diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h index 40a703b9693..1927ee94241 100644 --- a/sys/arch/amd64/include/param.h +++ b/sys/arch/amd64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.8 2005/10/26 18:46:07 martin Exp $ */ +/* $OpenBSD: param.h,v 1.9 2005/11/28 16:56:32 martin Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -151,7 +151,3 @@ #define x86_round_pdr(x) \ ((((unsigned long)(x)) + (NBPD_L2 - 1)) & ~(NBPD_L2 - 1)) #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 round_pdr(x) x86_round_pdr(x) |