[src/trunk]: src/sys/external/bsd/drm2/linux Ifdef out label used only by !__...

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

details:   https://anonhg.NetBSD.org/src/rev/6075d877741b
branches:  trunk
changeset: 835499:6075d877741b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 15:28:53 2018 +0000

description:
Ifdef out label used only by !__HAVE_MM_MD_DIRECT_MAPPED_PHYS.

diffstat:

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

diffs (52 lines):

diff -r 9ea5ac2fe3d2 -r 6075d877741b sys/external/bsd/drm2/linux/linux_kmap.c
--- a/sys/external/bsd/drm2/linux/linux_kmap.c  Mon Aug 27 15:28:39 2018 +0000
+++ b/sys/external/bsd/drm2/linux/linux_kmap.c  Mon Aug 27 15:28:53 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_kmap.c,v 1.15 2018/08/27 15:13:17 riastradh Exp $        */
+/*     $NetBSD: linux_kmap.c,v 1.16 2018/08/27 15:28:53 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.15 2018/08/27 15:13:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_kmap.c,v 1.16 2018/08/27 15:28:53 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/kmem.h>
@@ -166,7 +166,10 @@
        pmap_kenter_pa(vaddr, paddr, (VM_PROT_READ | VM_PROT_WRITE), 0);
        pmap_update(pmap_kernel());
 
-out:   SDT_PROBE2(sdt, linux, kmap, map__atomic,  paddr, vaddr);
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+out:
+#endif
+       SDT_PROBE2(sdt, linux, kmap, map__atomic,  paddr, vaddr);
        return (void *)vaddr;
 }
 
@@ -231,7 +234,10 @@
        pmap_kenter_pa(vaddr, paddr, (VM_PROT_READ | VM_PROT_WRITE), 0);
        pmap_update(pmap_kernel());
 
-out:   SDT_PROBE2(sdt, linux, kmap, map,  paddr, vaddr);
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+out:
+#endif
+       SDT_PROBE2(sdt, linux, kmap, map,  paddr, vaddr);
        return (void *)vaddr;
 }
 
@@ -265,5 +271,8 @@
 
        uvm_km_free(kernel_map, vaddr, PAGE_SIZE, UVM_KMF_VAONLY);
 
-out:   SDT_PROBE2(sdt, linux, kmap, unmap,  paddr, vaddr);
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+out:
+#endif
+       SDT_PROBE2(sdt, linux, kmap, unmap,  paddr, vaddr);
 }