Module Name: src
Committed By: riastradh
Date: Wed Aug 27 16:09:16 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/linux: linux_kmap.c
Log Message:
Assert sleepable in Linux kmap/kunmap.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_kmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/linux/linux_kmap.c
diff -u src/sys/external/bsd/drm2/linux/linux_kmap.c:1.6 src/sys/external/bsd/drm2/linux/linux_kmap.c:1.7
--- src/sys/external/bsd/drm2/linux/linux_kmap.c:1.6 Wed Aug 27 16:06:38 2014
+++ src/sys/external/bsd/drm2/linux/linux_kmap.c Wed Aug 27 16:09:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_kmap.c,v 1.6 2014/08/27 16:06:38 riastradh Exp $ */
+/* $NetBSD: linux_kmap.c,v 1.7 2014/08/27 16:09:16 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_kmap.c,v 1.6 2014/08/27 16:06:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_kmap.c,v 1.7 2014/08/27 16:09:16 riastradh Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
@@ -178,6 +178,9 @@ void *
kmap(struct page *page)
{
const paddr_t paddr = VM_PAGE_TO_PHYS(&page->p_vmp);
+
+ ASSERT_SLEEPABLE();
+
const vaddr_t vaddr = uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
(UVM_KMF_VAONLY | UVM_KMF_WAITVA));
KASSERT(vaddr != 0);
@@ -207,6 +210,8 @@ kunmap(struct page *page)
{
const paddr_t paddr = VM_PAGE_TO_PHYS(&page->p_vmp);
+ ASSERT_SLEEPABLE();
+
mutex_enter(&linux_kmap_lock);
struct linux_kmap_entry *const lke =
rb_tree_find_node(&linux_kmap_entries, &paddr);
