[src/trunk]: src/sys/arch/arm/fdt Fixed compile error.

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

details:   https://anonhg.NetBSD.org/src/rev/dc4800bf4d6d
branches:  trunk
changeset: 457781:dc4800bf4d6d
user:      hkenken <hkenken%NetBSD.org@localhost>
date:      Fri Jul 19 12:14:15 2019 +0000

description:
Fixed compile error.

diffstat:

 sys/arch/arm/fdt/gic_fdt.c   |  10 +++++-----
 sys/arch/arm/fdt/gicv3_fdt.c |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r b9d199554161 -r dc4800bf4d6d sys/arch/arm/fdt/gic_fdt.c
--- a/sys/arch/arm/fdt/gic_fdt.c        Fri Jul 19 10:54:26 2019 +0000
+++ b/sys/arch/arm/fdt/gic_fdt.c        Fri Jul 19 12:14:15 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_fdt.c,v 1.16 2019/01/26 14:43:46 thorpej Exp $ */
+/* $NetBSD: gic_fdt.c,v 1.17 2019/07/19 12:14:15 hkenken Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.16 2019/01/26 14:43:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.17 2019/07/19 12:14:15 hkenken Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -59,7 +59,7 @@
 
 static int     gic_fdt_match(device_t, cfdata_t, void *);
 static void    gic_fdt_attach(device_t, device_t, void *);
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
 static void    gic_fdt_attach_v2m(struct gic_fdt_softc *, bus_space_tag_t, int);
 #endif
 
@@ -179,7 +179,7 @@
 
        arm_fdt_irq_set_handler(armgic_irq_handler);
 
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
        for (int child = OF_child(phandle); child; child = OF_peer(child)) {
                if (!fdtbus_status_okay(child))
                        continue;
@@ -190,7 +190,7 @@
 #endif
 }
 
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
 static void
 gic_fdt_attach_v2m(struct gic_fdt_softc *sc, bus_space_tag_t bst, int phandle)
 {
diff -r b9d199554161 -r dc4800bf4d6d sys/arch/arm/fdt/gicv3_fdt.c
--- a/sys/arch/arm/fdt/gicv3_fdt.c      Fri Jul 19 10:54:26 2019 +0000
+++ b/sys/arch/arm/fdt/gicv3_fdt.c      Fri Jul 19 12:14:15 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_fdt.c,v 1.7 2019/01/26 14:43:46 thorpej Exp $ */
+/* $NetBSD: gicv3_fdt.c,v 1.8 2019/07/19 12:14:15 hkenken Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
 #define        _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.7 2019/01/26 14:43:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.8 2019/07/19 12:14:15 hkenken Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -61,7 +61,7 @@
 static void    gicv3_fdt_attach(device_t, device_t, void *);
 
 static int     gicv3_fdt_map_registers(struct gicv3_fdt_softc *);
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
 static void    gicv3_fdt_attach_its(struct gicv3_fdt_softc *, bus_space_tag_t, int);
 #endif
 
@@ -158,7 +158,7 @@
                return;
        }
 
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
        for (int child = OF_child(phandle); child; child = OF_peer(child)) {
                if (!fdtbus_status_okay(child))
                        continue;
@@ -238,7 +238,7 @@
        return 0;
 }
 
-#if NPCI > 0
+#if NPCI > 0 && defined(__HAVE_PCI_MSI_MSIX)
 static void
 gicv3_fdt_attach_its(struct gicv3_fdt_softc *sc, bus_space_tag_t bst, int phandle)
 {