[src/trunk]: src/sys/external/bsd/drm2/linux Work around `kmap' namespace cla...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2706c4e8309e
branches:  trunk
changeset: 993093:2706c4e8309e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 15:13:17 2018 +0000

description:
Work around `kmap' namespace clash another way.

diffstat:

 sys/external/bsd/drm2/include/linux/highmem.h |  10 +++++-----
 sys/external/bsd/drm2/linux/linux_kmap.c      |   8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (60 lines):

diff -r d40ae99b0caf -r 2706c4e8309e sys/external/bsd/drm2/include/linux/highmem.h
--- a/sys/external/bsd/drm2/include/linux/highmem.h     Mon Aug 27 15:13:05 2018 +0000
+++ b/sys/external/bsd/drm2/include/linux/highmem.h     Mon Aug 27 15:13:17 2018 +0000
@@ -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)
diff -r d40ae99b0caf -r 2706c4e8309e sys/external/bsd/drm2/linux/linux_kmap.c
--- a/sys/external/bsd/drm2/linux/linux_kmap.c  Mon Aug 27 15:13:05 2018 +0000
+++ b/sys/external/bsd/drm2/linux/linux_kmap.c  Mon Aug 27 15:13:17 2018 +0000
@@ -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 @@
 
 #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 @@
 }
 
 void *
-linux_kmap(struct page *page)
+kmap(struct page *page)
 {
        const paddr_t paddr = VM_PAGE_TO_PHYS(&page->p_vmp);
        vaddr_t vaddr;