diff options
| author | skra <skra@FreeBSD.org> | 2016-06-05 16:20:12 +0000 |
|---|---|---|
| committer | skra <skra@FreeBSD.org> | 2016-06-05 16:20:12 +0000 |
| commit | 612e6958e467e3c02b826846aba5b685d486c07c (patch) | |
| tree | 09f7a3292cf97e27a58700773b3817ba12f58e1b /sys/arm64 | |
| parent | ff4d6f61950f6358d7cdc508dfa92042f30d88d6 (diff) | |
| download | FreeBSD-src-612e6958e467e3c02b826846aba5b685d486c07c.zip FreeBSD-src-612e6958e467e3c02b826846aba5b685d486c07c.tar.gz | |
INTRNG - change the way how an interrupt mapping data are provided
to the framework in OFW (FDT) case.
This is a follow-up to r301451.
Differential Revision: https://reviews.freebsd.org/D6634
Diffstat (limited to 'sys/arm64')
| -rw-r--r-- | sys/arm64/arm64/gic_v3.c | 4 | ||||
| -rw-r--r-- | sys/arm64/arm64/nexus.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c index f2d019a..1f9557e 100644 --- a/sys/arm64/arm64/gic_v3.c +++ b/sys/arm64/arm64/gic_v3.c @@ -58,6 +58,10 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/intr.h> +#ifdef FDT +#include <dev/ofw/ofw_bus_subr.h> +#endif + #include "pic_if.h" #include "gic_v3_reg.h" diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 93f55ae..c57a309 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -448,7 +448,7 @@ nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int icells, pcell_t *intr) { #ifdef INTRNG - return (intr_fdt_map_irq(iparent, intr, icells)); + return (INTR_IRQ_INVALID); #else int irq; |
