From: Marc Zyngier Date: Tue, 6 Sep 2011 09:23:45 +0000 (+0100) Subject: ARM: zynq: convert to CONFIG_MULTI_IRQ_HANDLER X-Git-Tag: firefly_0821_release~3680^2~2832^2~2^2~36^2~16 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=368b8e252335725ea72d7bcbb3b1c8837b8dfeed;p=firefly-linux-kernel-4.4.55.git ARM: zynq: convert to CONFIG_MULTI_IRQ_HANDLER Convert the zynq platform to be using the gic_handle_irq function as its primary interrupt handler. Acked-by: John Linn Signed-off-by: Marc Zyngier --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 21644caeb29b..d99ee9ba2324 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -979,6 +979,7 @@ config ARCH_ZYNQ select ARM_AMBA select ICST select USE_OF + select MULTI_IRQ_HANDLER help Support for Xilinx Zynq ARM Cortex A9 Platform endchoice diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 73e93687b81a..ab5cfddc0d7b 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -112,6 +112,7 @@ static const char *xilinx_dt_match[] = { MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") .map_io = xilinx_map_io, .init_irq = xilinx_irq_init, + .handle_irq = gic_handle_irq, .init_machine = xilinx_init_machine, .timer = &xttcpss_sys_timer, .dt_compat = xilinx_dt_match, diff --git a/arch/arm/mach-zynq/include/mach/entry-macro.S b/arch/arm/mach-zynq/include/mach/entry-macro.S index 3cfc01b37461..d621fb732569 100644 --- a/arch/arm/mach-zynq/include/mach/entry-macro.S +++ b/arch/arm/mach-zynq/include/mach/entry-macro.S @@ -20,9 +20,6 @@ * GNU General Public License for more details. */ -#include -#include - .macro disable_fiq .endm