diff options
| -rw-r--r-- | sys/arch/sparc/sparc/machdep.c | 7 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/vm_machdep.c | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index a0f5e3a784e..d689907ce16 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.63 2001/09/12 00:23:34 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.64 2001/09/17 15:18:16 art Exp $ */ /* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */ /* @@ -243,9 +243,8 @@ cpu_startup() if (pg == NULL) panic("cpu_startup: " "not enough RAM for buffer cache"); - pmap_enter(kernel_map->pmap, curbuf, - VM_PAGE_TO_PHYS(pg), VM_PROT_READ | VM_PROT_WRITE, - VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED); + pmap_kenter_pa(curbuf, VM_PAGE_TO_PHYS(pg), + VM_PROT_READ|VM_PROT_WRITE); curbuf += PAGE_SIZE; curbufsize -= PAGE_SIZE; } diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c index ed67b3abd2f..d552abf11b7 100644 --- a/sys/arch/sparc/sparc/vm_machdep.c +++ b/sys/arch/sparc/sparc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.30 2001/08/08 01:30:02 art Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.31 2001/09/17 15:18:16 art Exp $ */ /* $NetBSD: vm_machdep.c,v 1.30 1997/03/10 23:55:40 pk Exp $ */ /* @@ -90,11 +90,8 @@ pagemove(from, to, size) while (size > 0) { if (pmap_extract(pmap_kernel(), (vaddr_t)from, &pa) == FALSE) panic("pagemove 2"); - pmap_remove(pmap_kernel(), - (vaddr_t)from, (vaddr_t)from + PAGE_SIZE); - pmap_enter(pmap_kernel(), - (vaddr_t)to, pa, VM_PROT_READ | VM_PROT_WRITE, - VM_PROT_READ | VM_PROT_WRITE | PMAP_WIRED); + pmap_kremove((vaddr_t)from, PAGE_SIZE); + pmap_kenter_pa((vaddr_t)to, pa, VM_PROT_READ|VM_PROT_WRITE); from += PAGE_SIZE; to += PAGE_SIZE; size -= PAGE_SIZE; |