Module Name: src
Committed By: riastradh
Date: Fri Mar 28 23:19:41 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/linux: linux_kmap.c
Log Message:
Remove needless splvm/splx calls.
>From rmind@, who explained that the pmap(9) man page is wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 src/sys/external/bsd/drm2/linux/linux_kmap.c:1.3
--- src/sys/external/bsd/drm2/linux/linux_kmap.c:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/external/bsd/drm2/linux/linux_kmap.c Fri Mar 28 23:19:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_kmap.c,v 1.2 2014/03/18 18:20:43 riastradh Exp $ */
+/* $NetBSD: linux_kmap.c,v 1.3 2014/03/28 23:19:41 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.2 2014/03/18 18:20:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_kmap.c,v 1.3 2014/03/28 23:19:41 riastradh Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
@@ -194,16 +194,12 @@ kmap(struct page *page)
KASSERT(collision == lke);
mutex_spin_exit(&linux_kmap_lock);
- const int s = splvm();
-
KASSERT(!pmap_extract(pmap_kernel(), vaddr, NULL));
const int prot = (VM_PROT_READ | VM_PROT_WRITE);
const int flags = 0;
pmap_kenter_pa(vaddr, paddr, prot, flags);
pmap_update(pmap_kernel());
- splx(s);
-
return (void *)vaddr;
}
@@ -222,12 +218,8 @@ kunmap(struct page *page)
const vaddr_t vaddr = lke->lke_vaddr;
kmem_free(lke, sizeof(*lke));
- const int s = splvm();
-
KASSERT(pmap_extract(pmap_kernel(), vaddr, NULL));
pmap_kremove(vaddr, PAGE_SIZE);
pmap_update(pmap_kernel());
-
- splx(s);
}
