summaryrefslogtreecommitdiff
path: root/sys/arch/amiga/dev
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-05-28 02:34:14 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-05-28 02:34:14 +0000
commit3adde7fd9c853fb80954af2b1e206dfe199aac33 (patch)
tree3b0f1d8ff7d380f128901746e527404f00658a17 /sys/arch/amiga/dev
parentf5d25e37500faf5967513c5216ebf066c0725b84 (diff)
UVM. kmem_alloc -> uvm_km_zalloc. And one ugly construction -> uvm_km_valloc.
Diffstat (limited to 'sys/arch/amiga/dev')
-rw-r--r--sys/arch/amiga/dev/sfas.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/arch/amiga/dev/sfas.c b/sys/arch/amiga/dev/sfas.c
index 1a2fba01ad2..1aee5e110a9 100644
--- a/sys/arch/amiga/dev/sfas.c
+++ b/sys/arch/amiga/dev/sfas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sfas.c,v 1.6 1997/01/16 09:25:25 niklas Exp $ */
+/* $OpenBSD: sfas.c,v 1.7 2000/05/28 02:34:13 art Exp $ */
/* $NetBSD: sfas.c,v 1.12 1996/10/13 03:07:33 christos Exp $ */
/*
@@ -232,8 +232,13 @@ sfasinitialize(dev)
dev->sc_bump_pa = (vm_offset_t)
PREP_DMA_MEM(dev->sc_bump_va);
} else {
+#if defined(UVM)
+ dev->sc_bump_va = (u_char *)uvm_km_zalloc(kernel_map,
+ dev->sc_bump_sz);
+#else
dev->sc_bump_va = (u_char *)kmem_alloc(kernel_map,
dev->sc_bump_sz);
+#endif
dev->sc_bump_pa = kvtop(dev->sc_bump_va);
}
@@ -257,6 +262,9 @@ sfasinitialize(dev)
* of virtual memory to which we can later map physical memory to.
*/
#ifdef SFAS_NEED_VM_PATCH
+#if defined(UVM)
+ dev->sc_vm_link = (u_char *)uvm_km_valloc(kernel_map, MAXPHYS + NBPG);
+#else
vm_map_lock(kernel_map);
/* Locate available space. */
@@ -279,6 +287,7 @@ sfasinitialize(dev)
(vm_offset_t)dev->sc_vm_link+(MAXPHYS+NBPG));
vm_map_unlock(kernel_map);
}
+#endif /* UVM */
dev->sc_vm_link_pages = 0;
#endif