diff options
| author |   mickey <mickey@openbsd.org> | 2005-07-04 01:02:10 +0000 |
|---|---|---|
| committer | mickey <mickey@openbsd.org> | 2005-07-04 01:02:10 +0000 |
| commit | 4eaa1c1fa6e7012a51a99b1b40c4fb07185a80e2 (patch) | |
| tree | c1c23a5d25b6befc4e95d5dee9b244f59b4b9176 | |
| parent | always enforce cache-inhibit if bus_space_map()ping uncachable; drahn@ ok (diff) | |
| download | wireguard-openbsd-4eaa1c1fa6e7012a51a99b1b40c4fb07185a80e2.tar.xz wireguard-openbsd-4eaa1c1fa6e7012a51a99b1b40c4fb07185a80e2.zip | |
do not allocate any PA allocating VA for mapping devices; drahn@ ok
| -rw-r--r-- | sys/arch/macppc/macppc/machdep.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index c721dbcfea2..83b5475c111 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.71 2005/07/04 00:59:56 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.72 2005/07/04 01:02:10 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -1115,7 +1115,8 @@ bus_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int cacheable, panic("ppc_kvm_stolen, out of space"); } } else { - vaddr = uvm_km_valloc_wait(phys_map, len); + vaddr = uvm_km_kmemalloc(phys_map, NULL, len, + UVM_KMF_NOWAIT|UVM_KMF_VALLOC); if (vaddr == 0) panic("bus_mem_add_mapping: kvm alloc of 0x%x failed", len); @@ -1170,7 +1171,8 @@ mapiodev(paddr_t pa, psize_t len) panic("ppc_kvm_stolen, out of space"); } } else { - va = uvm_km_valloc_wait(phys_map, size); + va = uvm_km_kmemalloc(phys_map, NULL, size, + UVM_KMF_NOWAIT|UVM_KMF_VALLOC); } if (va == 0) |