diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2011-11-02 11:28:49 -0400 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2011-11-15 13:13:04 -0500 |
commit | baeeb8229cace91c10c856d91e5ca861d3c44968 (patch) | |
tree | febc69c7c0458df9ae0a3d0b05bc2590fa3df291 /arch/arm/plat-mxc/include/mach | |
parent | abeb24ae4d3e543ecf0104cff08a3af4e7a42479 (diff) |
ARM: mxc: rename gic_handle_irq to avoid name clash
Before introducing a global gic_handle_irq(), rename
MXC's version to mxc_gic_handle_irq(). This function will be
removed altogether in a later patch.
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/mach')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 83b745a5e1b7..d7c290d32e3e 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h | |||
@@ -90,7 +90,7 @@ 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 gic_handle_irq(struct pt_regs *); | 93 | void mxc_gic_handle_irq(struct pt_regs *); |
94 | 94 | ||
95 | #define imx1_handle_irq avic_handle_irq | 95 | #define imx1_handle_irq avic_handle_irq |
96 | #define imx21_handle_irq avic_handle_irq | 96 | #define imx21_handle_irq avic_handle_irq |
@@ -101,7 +101,7 @@ void gic_handle_irq(struct pt_regs *); | |||
101 | #define imx50_handle_irq tzic_handle_irq | 101 | #define imx50_handle_irq tzic_handle_irq |
102 | #define imx51_handle_irq tzic_handle_irq | 102 | #define imx51_handle_irq tzic_handle_irq |
103 | #define imx53_handle_irq tzic_handle_irq | 103 | #define imx53_handle_irq tzic_handle_irq |
104 | #define imx6q_handle_irq gic_handle_irq | 104 | #define imx6q_handle_irq mxc_gic_handle_irq |
105 | 105 | ||
106 | extern void imx_enable_cpu(int cpu, bool enable); | 106 | extern void imx_enable_cpu(int cpu, bool enable); |
107 | extern void imx_set_cpu_jump(int cpu, void *jump_addr); | 107 | extern void imx_set_cpu_jump(int cpu, void *jump_addr); |