diff options
| -rw-r--r-- | sys/arch/amd64/amd64/pmap.c | 20 | ||||
| -rw-r--r-- | sys/arch/amd64/include/pmap.h | 8 |
2 files changed, 2 insertions, 26 deletions
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index bbb40e87308..9e1d424080e 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.9 2005/05/27 19:32:39 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.10 2005/06/01 14:36:36 brad Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -1649,24 +1649,6 @@ pmap_extract(pmap, va, pap) return FALSE; } - -/* - * vtophys: virtual address to physical address. For use by - * machine-dependent code only. - */ - -paddr_t -vtophys(va) - vaddr_t va; -{ - paddr_t pa; - - if (pmap_extract(pmap_kernel(), va, &pa) == TRUE) - return (pa); - return (0); -} - - /* * pmap_map: map a range of PAs into kvm * diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h index eeb26c3fdbd..28ec7b51183 100644 --- a/sys/arch/amd64/include/pmap.h +++ b/sys/arch/amd64/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.6 2005/05/27 19:32:39 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.7 2005/06/01 14:36:36 brad Exp $ */ /* $NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $ */ /* @@ -555,7 +555,6 @@ kvtopte(vaddr_t va) #define pmap_cpu_has_pg_n() (1) #define pmap_cpu_has_invlpg (1) -paddr_t vtophys(vaddr_t); vaddr_t pmap_map(vaddr_t, paddr_t, paddr_t, vm_prot_t); #if 0 /* XXXfvdl was USER_LDT, need to check if that can be supported */ @@ -563,11 +562,6 @@ void pmap_ldt_cleanup(struct proc *); #define PMAP_FORK #endif /* USER_LDT */ -/* - * Hooks for the pool allocator. - */ -/* #define POOL_VTOPHYS(va) vtophys((vaddr_t) (va)) */ - #define PMAP_DIRECT_MAP(pa) ((vaddr_t)PMAP_DIRECT_BASE + pa) #define PMAP_DIRECT_UNMAP(va) ((paddr_t)va - PMAP_DIRECT_BASE) |