Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baeeb822 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent abeb24ae

arch/arm/plat-mxc/gic.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <asm/smp.h>

#endif



asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)

asmlinkage void __exception_irq_entry mxc_gic_handle_irq(struct pt_regs *regs)

{

	u32 irqstat, irqnr;

arch/arm/plat-mxc/include/mach/common.h

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ extern void imx_print_silicon_rev(const char *cpu, int srev); 


void avic_handle_irq(struct pt_regs *);

void tzic_handle_irq(struct pt_regs *);

void gic_handle_irq(struct pt_regs *);

void mxc_gic_handle_irq(struct pt_regs *);



#define imx1_handle_irq avic_handle_irq

#define imx21_handle_irq avic_handle_irq
@@ -101,7 +101,7 @@ void gic_handle_irq(struct pt_regs *); 
#define imx50_handle_irq tzic_handle_irq

#define imx51_handle_irq tzic_handle_irq

#define imx53_handle_irq tzic_handle_irq

#define imx6q_handle_irq gic_handle_irq

#define imx6q_handle_irq mxc_gic_handle_irq



extern void imx_enable_cpu(int cpu, bool enable);

extern void imx_set_cpu_jump(int cpu, void *jump_addr);