diff options
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/pmap.h | 4 | ||||
| -rw-r--r-- | sys/vm/vm_fault.c | 6 | ||||
| -rw-r--r-- | sys/vm/vm_glue.c | 4 | ||||
| -rw-r--r-- | sys/vm/vm_kern.c | 4 | ||||
| -rw-r--r-- | sys/vm/vm_map.c | 4 | ||||
| -rw-r--r-- | sys/vm/vm_page.c | 8 | ||||
| -rw-r--r-- | sys/vm/vm_pager.c | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index af0091c5556..5044bca98ed 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.10 1999/07/18 18:00:08 deraadt Exp $ */ +/* $OpenBSD: pmap.h,v 1.11 1999/09/03 18:02:26 art Exp $ */ /* $NetBSD: pmap.h,v 1.16 1996/03/31 22:15:32 pk Exp $ */ /* @@ -139,7 +139,7 @@ pmap_t pmap_create __P((vsize_t)); #endif void pmap_destroy __P((pmap_t)); void pmap_enter __P((pmap_t, - vaddr_t, paddr_t, vm_prot_t, boolean_t)); + vaddr_t, paddr_t, vm_prot_t, boolean_t, vm_prot_t)); paddr_t pmap_extract __P((pmap_t, vaddr_t)); #if defined(PMAP_NEW) && defined(PMAP_GROWKERNEL) void pmap_growkernel __P((vaddr_t)); diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 45ba17b3e10..cf141035a1d 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_fault.c,v 1.16 1998/03/30 18:50:59 niklas Exp $ */ +/* $OpenBSD: vm_fault.c,v 1.17 1999/09/03 18:02:27 art Exp $ */ /* $NetBSD: vm_fault.c,v 1.21 1998/01/31 04:02:39 ross Exp $ */ /* @@ -816,7 +816,7 @@ vm_fault(map, vaddr, fault_type, change_wiring) * that the page-out daemon won't find us (yet). */ - pmap_enter(map->pmap, vaddr, VM_PAGE_TO_PHYS(m), prot, wired); + pmap_enter(map->pmap, vaddr, VM_PAGE_TO_PHYS(m), prot, wired, 0); /* * If the page is not wired down, then put it where the @@ -1016,7 +1016,7 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry) vm_object_unlock(dst_object); pmap_enter(dst_map->pmap, vaddr, VM_PAGE_TO_PHYS(dst_m), prot, - FALSE); + FALSE, 0); /* * Mark it no longer busy, and put it on the active list. diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 0a6edfb0a1c..f76b5e7316a 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_glue.c,v 1.34 1999/08/17 18:48:59 niklas Exp $ */ +/* $OpenBSD: vm_glue.c,v 1.35 1999/09/03 18:02:27 art Exp $ */ /* $NetBSD: vm_glue.c,v 1.55.4.1 1996/06/13 17:25:45 cgd Exp $ */ /* @@ -169,7 +169,7 @@ chgkprot(addr, len, rw) pa = pmap_extract(pmap_kernel(), sva|1); if (pa == 0) panic("chgkprot: invalid page"); - pmap_enter(pmap_kernel(), sva, pa&~1, prot, TRUE); + pmap_enter(pmap_kernel(), sva, pa&~1, prot, TRUE, 0); } } #endif diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index ea3953c457d..c2da9722860 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_kern.c,v 1.10 1998/03/01 00:38:08 niklas Exp $ */ +/* $OpenBSD: vm_kern.c,v 1.11 1999/09/03 18:02:27 art Exp $ */ /* $NetBSD: vm_kern.c,v 1.17.6.1 1996/06/13 17:21:28 cgd Exp $ */ /* @@ -378,7 +378,7 @@ kmem_malloc(map, size, canwait) m = vm_page_lookup(kmem_object, offset + i); vm_object_unlock(kmem_object); pmap_enter(map->pmap, addr + i, VM_PAGE_TO_PHYS(m), - VM_PROT_DEFAULT, TRUE); + VM_PROT_DEFAULT, TRUE, 0); } vm_map_unlock(map); diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 4bf81216712..226be9e7f5d 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_map.c,v 1.17 1999/01/10 21:19:50 art Exp $ */ +/* $OpenBSD: vm_map.c,v 1.18 1999/09/03 18:02:28 art Exp $ */ /* $NetBSD: vm_map.c,v 1.23 1996/02/10 00:08:08 christos Exp $ */ /* @@ -357,7 +357,7 @@ vm_map_entry_create(map) PAGE_WAKEUP(m); pmap_enter(pmap_kernel(), mapvm, VM_PAGE_TO_PHYS(m), - VM_PROT_READ|VM_PROT_WRITE, FALSE); + VM_PROT_READ|VM_PROT_WRITE, FALSE, 0); entry = (vm_map_entry_t) mapvm; mapvm += PAGE_SIZE; diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 766c274f933..4b2137d668a 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_page.c,v 1.16 1999/02/19 02:54:36 deraadt Exp $ */ +/* $OpenBSD: vm_page.c,v 1.17 1999/09/03 18:02:28 art Exp $ */ /* $NetBSD: vm_page.c,v 1.41 1998/02/08 18:24:52 thorpej Exp $ */ #define VM_PAGE_ALLOC_MEMORY_STATS @@ -410,7 +410,7 @@ vm_bootstrap_steal_memory(size) /* XXX: should be wired, but some pmaps don't like that ... */ pmap_enter(pmap_kernel(), vaddr, paddr, - VM_PROT_READ|VM_PROT_WRITE, FALSE); + VM_PROT_READ|VM_PROT_WRITE, FALSE, 0); } return(addr); #endif /* PMAP_STEAL_MEMORY */ @@ -1007,7 +1007,7 @@ vm_bootstrap_steal_memory(size) */ pmap_enter(pmap_kernel(), vaddr, paddr, - VM_PROT_READ|VM_PROT_WRITE, FALSE); + VM_PROT_READ|VM_PROT_WRITE, FALSE, 0); } return addr; @@ -1840,7 +1840,7 @@ vm_page_alloc_contig(size, low, high, alignment) tmp_addr - VM_MIN_KERNEL_ADDRESS); vm_page_wire(m); pmap_enter(pmap_kernel(), tmp_addr, VM_PAGE_TO_PHYS(m), - VM_PROT_READ|VM_PROT_WRITE, TRUE); + VM_PROT_READ|VM_PROT_WRITE, TRUE, 0); tmp_addr += PAGE_SIZE; } return addr; diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 1fc3e730b49..61c2161b53d 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_pager.c,v 1.8 1997/11/06 05:59:37 csapuntz Exp $ */ +/* $OpenBSD: vm_pager.c,v 1.9 1999/09/03 18:02:29 art Exp $ */ /* $NetBSD: vm_pager.c,v 1.21 1996/03/16 23:15:25 christos Exp $ */ /* @@ -341,7 +341,7 @@ vm_pager_map_pages(mlist, npages, canwait) m->flags |= PG_PAGEROWNED; #endif pmap_enter(vm_map_pmap(pager_map), va, VM_PAGE_TO_PHYS(m), - VM_PROT_DEFAULT, TRUE); + VM_PROT_DEFAULT, TRUE, 0); } return (kva); } |