Module Name: src
Committed By: hkenken
Date: Fri Jul 19 12:14:16 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: gic_fdt.c gicv3_fdt.c
Log Message:
Fixed compile error.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/fdt/gic_fdt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/fdt/gicv3_fdt.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/arch/arm/fdt/gic_fdt.c
diff -u src/sys/arch/arm/fdt/gic_fdt.c:1.16 src/sys/arch/arm/fdt/gic_fdt.c:1.17
--- src/sys/arch/arm/fdt/gic_fdt.c:1.16 Sat Jan 26 14:43:46 2019
+++ src/sys/arch/arm/fdt/gic_fdt.c Fri Jul 19 12:14:15 2019
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ struct gic_fdt_irq;
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 @@ gic_fdt_attach(device_t parent, device_t
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 @@ gic_fdt_attach(device_t parent, device_t
#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)
{
Index: src/sys/arch/arm/fdt/gicv3_fdt.c
diff -u src/sys/arch/arm/fdt/gicv3_fdt.c:1.7 src/sys/arch/arm/fdt/gicv3_fdt.c:1.8
--- src/sys/arch/arm/fdt/gicv3_fdt.c:1.7 Sat Jan 26 14:43:46 2019
+++ src/sys/arch/arm/fdt/gicv3_fdt.c Fri Jul 19 12:14:15 2019
@@ -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 <jmcne...@invisible.ca>
@@ -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 int gicv3_fdt_match(device_t, cfd
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 @@ gicv3_fdt_attach(device_t parent, device
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 @@ gicv3_fdt_map_registers(struct gicv3_fdt
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)
{
