diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-12-08 12:15:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-12-08 12:15:04 +0000 |
| commit | 8abcb90befd035bc4b13913138ad3c0c04d6b220 (patch) | |
| tree | a02a6e356fe8e23710d8832191c7db3909e751df /sys | |
| parent | 1ac9e7117bdf13d724d7b263961d4c3182823591 (diff) | |
undo total garbage untested sloppy commit from art
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/sparc/pmap.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index a411ec141b7..b406b31ab7e 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.48 1999/12/08 11:38:38 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.49 1999/12/08 12:15:03 deraadt Exp $ */ /* $NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */ /* @@ -5738,21 +5738,7 @@ pmap_kenter_pa4m(va, pa, prot) paddr_t pa; vm_prot_t prot; { -#if 1 - struct pvlist *pv; - int pteproto, ctx; - - pteproto = ((pa & PMAP_NC) == 0 ? SRMMU_PG_C : 0) | - PMAP_T2PTE_SRMMU(pa) | SRMMU_TEPTE | PPROT_RX_RX | PPROT_S | - (atop(pa) << SRMMU_PPNSHIFT) | - ((prot & VM_PROT_WRITE) ? PPROT_WRITE : 0); - pv = pvhead(atop(pa)); - - ctx = getcontext4m(); - pmap_enk4m(pmap_kernel(), va, prot, TRUE, pv, pteproto); -#else pmap_enter4m(pmap_kernel(), va, pa, prot, TRUE, 0); -#endif } void @@ -5763,9 +5749,10 @@ pmap_kenter_pgs4m(va, pgs, npgs) { int i; - for (i = 0; i < npgs; i++, va += PAGE_SIZE) - pmap_kenter_pa4m(va, VM_PAGE_TO_PHYS(pgs[i]), - VM_PROT_READ|VM_PROT_WRITE); + for (i = 0; i < npgs; i++, va += PAGE_SIZE) { + pmap_enter4m(pmap_kernel(), va, VM_PAGE_TO_PHYS(pgs[i]), + VM_PROT_READ|VM_PROT_WRITE, TRUE, 0); + } } void |