From: jsg <jsg@openbsd.org>
Date: Wed, 8 Apr 2015 15:01:33 +0000 (+0000)
Subject: Move vmap back to kernel_map/uvm_km_valloc as it's allowed to fail.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7f1da471ec418f17d886ea590f17c00cf37da8c6;p=openbsd

Move vmap back to kernel_map/uvm_km_valloc as it's allowed to fail.
This should help dlg's dell 2950 that gets stuck during boot with vmap
in the trace.

ok kettenis@
---

diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c
index 7939c70570a..97aaa90c0a1 100644
--- a/sys/dev/pci/drm/drm_linux.c
+++ b/sys/dev/pci/drm/drm_linux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: drm_linux.c,v 1.3 2015/04/08 02:28:13 jsg Exp $	*/
+/*	$OpenBSD: drm_linux.c,v 1.4 2015/04/08 15:01:33 jsg Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org>
  *
@@ -155,7 +155,7 @@ vmap(struct vm_page **pages, unsigned int npages, unsigned long flags,
 	paddr_t pa;
 	int i;
 
-	va = uvm_km_valloc_wait(phys_map, PAGE_SIZE * npages);
+	va = uvm_km_valloc(kernel_map, PAGE_SIZE * npages);
 	if (va == 0)
 		return NULL;
 	for (i = 0; i < npages; i++) {
@@ -176,6 +176,6 @@ vunmap(void *addr, size_t size)
 
 	pmap_remove(pmap_kernel(), va, va + size);
 	pmap_update(pmap_kernel());
-	uvm_km_free(phys_map, va, size);
+	uvm_km_free(kernel_map, va, size);
 }