[src/trunk]: src/sys/external/bsd/drm2/linux Work around a namespacing clash ...

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

details:   https://anonhg.NetBSD.org/src/rev/a30daeedc29e
branches:  trunk
changeset: 835461:a30daeedc29e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 15:09:58 2018 +0000

description:
Work around a namespacing clash between dtrace and linux symbol.

diffstat:

 sys/external/bsd/drm2/linux/linux_kmap.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 039336a717ff -r a30daeedc29e sys/external/bsd/drm2/linux/linux_kmap.c
--- a/sys/external/bsd/drm2/linux/linux_kmap.c  Mon Aug 27 15:09:35 2018 +0000
+++ b/sys/external/bsd/drm2/linux/linux_kmap.c  Mon Aug 27 15:09:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_kmap.c,v 1.13 2018/08/27 15:07:11 riastradh Exp $        */
+/*     $NetBSD: linux_kmap.c,v 1.14 2018/08/27 15:09:58 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.13 2018/08/27 15:07:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_kmap.c,v 1.14 2018/08/27 15:09:58 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/kmem.h>
@@ -46,6 +46,8 @@
 
 #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,
@@ -200,7 +202,7 @@
 }
 
 void *
-kmap(struct page *page)
+linux_kmap(struct page *page)
 {
        const paddr_t paddr = VM_PAGE_TO_PHYS(&page->p_vmp);
        vaddr_t vaddr;