Module Name: src
Committed By: riastradh
Date: Mon Aug 27 15:13:17 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/include/linux: highmem.h
src/sys/external/bsd/drm2/linux: linux_kmap.c
Log Message:
Work around `kmap' namespace clash another way.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/highmem.h
cvs rdiff -u -r1.14 -r1.15 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/include/linux/highmem.h
diff -u src/sys/external/bsd/drm2/include/linux/highmem.h:1.4 src/sys/external/bsd/drm2/include/linux/highmem.h:1.5
--- src/sys/external/bsd/drm2/include/linux/highmem.h:1.4 Mon Aug 27 07:44:32 2018
+++ src/sys/external/bsd/drm2/include/linux/highmem.h Mon Aug 27 15:13:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: highmem.h,v 1.4 2018/08/27 07:44:32 riastradh Exp $ */
+/* $NetBSD: highmem.h,v 1.5 2018/08/27 15:13:17 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -41,10 +41,10 @@
#include <linux/mm_types.h>
/* XXX Make the nm output a little more greppable... */
-#define kmap linux_kmap
-#define kmap_atomic linux_kmap_atomic
-#define kunmap linux_kunmap
-#define kunmap_atomic linux_kunmap_atomic
+#define kmap(p) linux_kmap(p)
+#define kmap_atomic(p) linux_kmap_atomic(p)
+#define kunmap(p) linux_kunmap(p)
+#define kunmap_atomic(p) linux_kunmap_atomic(p)
/* XXX Kludge! */
#define kmap_atomic_prot(page, prot) kmap_atomic(page)
Index: src/sys/external/bsd/drm2/linux/linux_kmap.c
diff -u src/sys/external/bsd/drm2/linux/linux_kmap.c:1.14 src/sys/external/bsd/drm2/linux/linux_kmap.c:1.15
--- src/sys/external/bsd/drm2/linux/linux_kmap.c:1.14 Mon Aug 27 15:09:58 2018
+++ src/sys/external/bsd/drm2/linux/linux_kmap.c Mon Aug 27 15:13:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_kmap.c,v 1.14 2018/08/27 15:09:58 riastradh Exp $ */
+/* $NetBSD: linux_kmap.c,v 1.15 2018/08/27 15:13:17 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.14 2018/08/27 15:09:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_kmap.c,v 1.15 2018/08/27 15:13:17 riastradh Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_kmap.c
#include <linux/highmem.h>
-#undef linux_kmap /* symbol vs trace point namespace clash */
-
SDT_PROBE_DEFINE2(sdt, linux, kmap, map,
"paddr_t"/*paddr*/, "vaddr_t"/*vaddr*/);
SDT_PROBE_DEFINE2(sdt, linux, kmap, unmap,
@@ -202,7 +200,7 @@ kunmap_atomic(void *addr)
}
void *
-linux_kmap(struct page *page)
+kmap(struct page *page)
{
const paddr_t paddr = VM_PAGE_TO_PHYS(&page->p_vmp);
vaddr_t vaddr;
