diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2011-09-06 05:23:45 -0400 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2011-11-15 13:13:59 -0500 |
commit | fea9fe8329c74159fb2030f1aacf29fdab9fc6d6 (patch) | |
tree | 658f1ebb663ca822f4be0e7d03ef56935270a178 /arch/arm/plat-mxc/include | |
parent | 562e0027d21bf64838178e2f5157df3d5833972e (diff) |
ARM: imx: convert smp platforms to global gic_handle_irq()
Convert the SMP imx platforms to use the global gic_handle_irq()
function instead a private function.
Cc: Sascha Hauer <kernel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/plat-mxc/include')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 3 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/entry-macro.S | 11 |
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index d7c290d32e3..14b4703e6e4 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h | |||
@@ -90,7 +90,6 @@ extern void imx_print_silicon_rev(const char *cpu, int srev); | |||
90 | 90 | ||
91 | void avic_handle_irq(struct pt_regs *); | 91 | void avic_handle_irq(struct pt_regs *); |
92 | void tzic_handle_irq(struct pt_regs *); | 92 | void tzic_handle_irq(struct pt_regs *); |
93 | void mxc_gic_handle_irq(struct pt_regs *); | ||
94 | 93 | ||
95 | #define imx1_handle_irq avic_handle_irq | 94 | #define imx1_handle_irq avic_handle_irq |
96 | #define imx21_handle_irq avic_handle_irq | 95 | #define imx21_handle_irq avic_handle_irq |
@@ -101,7 +100,7 @@ void mxc_gic_handle_irq(struct pt_regs *); | |||
101 | #define imx50_handle_irq tzic_handle_irq | 100 | #define imx50_handle_irq tzic_handle_irq |
102 | #define imx51_handle_irq tzic_handle_irq | 101 | #define imx51_handle_irq tzic_handle_irq |
103 | #define imx53_handle_irq tzic_handle_irq | 102 | #define imx53_handle_irq tzic_handle_irq |
104 | #define imx6q_handle_irq mxc_gic_handle_irq | 103 | #define imx6q_handle_irq gic_handle_irq |
105 | 104 | ||
106 | extern void imx_enable_cpu(int cpu, bool enable); | 105 | extern void imx_enable_cpu(int cpu, bool enable); |
107 | extern void imx_set_cpu_jump(int cpu, void *jump_addr); | 106 | extern void imx_set_cpu_jump(int cpu, void *jump_addr); |
diff --git a/arch/arm/plat-mxc/include/mach/entry-macro.S b/arch/arm/plat-mxc/include/mach/entry-macro.S index ca5cf26a04b..def5d30cb67 100644 --- a/arch/arm/plat-mxc/include/mach/entry-macro.S +++ b/arch/arm/plat-mxc/include/mach/entry-macro.S | |||
@@ -9,19 +9,8 @@ | |||
9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | /* Unused, we use CONFIG_MULTI_IRQ_HANDLER */ | ||
13 | |||
14 | .macro disable_fiq | 12 | .macro disable_fiq |
15 | .endm | 13 | .endm |
16 | 14 | ||
17 | .macro get_irqnr_preamble, base, tmp | ||
18 | .endm | ||
19 | |||
20 | .macro arch_ret_to_user, tmp1, tmp2 | 15 | .macro arch_ret_to_user, tmp1, tmp2 |
21 | .endm | 16 | .endm |
22 | |||
23 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
24 | .endm | ||
25 | |||
26 | .macro test_for_ipi, irqnr, irqstat, base, tmp | ||
27 | .endm | ||