From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 02/17] ARM: mxc: rename gic_handle_irq to avoid name clash
Date: Fri, 4 Nov 2011 16:57:36 +0000 [thread overview]
Message-ID: <1320425871-30564-3-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1320425871-30564-1-git-send-email-marc.zyngier@arm.com>
Before introducing a global gic_handle_irq(), rename
MXC's version to mcx_gic_handle_irq(). This function will be
removed altogether in a later patch.
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/plat-mxc/gic.c | 2 +-
arch/arm/plat-mxc/include/mach/common.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-mxc/gic.c b/arch/arm/plat-mxc/gic.c
index 12f8f81..ea51ea4 100644
--- a/arch/arm/plat-mxc/gic.c
+++ b/arch/arm/plat-mxc/gic.c
@@ -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;
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index 83b745a..f6c13ab 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);
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 mcx_gic_handle_irq
extern void imx_enable_cpu(int cpu, bool enable);
extern void imx_set_cpu_jump(int cpu, void *jump_addr);
--
1.7.0.4
next prev parent reply other threads:[~2011-11-04 16:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-04 16:57 [PATCH v3 00/17] Switch GIC users (and omap2plus) to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 01/17] ARM: Make global handler and CONFIG_MULTI_IRQ_HANDLER mutually exclusive Marc Zyngier
2011-11-04 18:30 ` Nicolas Pitre
2011-11-04 20:37 ` Eric Miao
2011-11-07 9:45 ` Jamie Iles
2011-11-07 11:02 ` Linus Walleij
2011-11-07 11:12 ` Marc Zyngier
2011-11-07 11:17 ` Jamie Iles
2011-11-07 11:22 ` Marc Zyngier
2011-11-04 16:57 ` Marc Zyngier [this message]
2011-11-04 21:09 ` [PATCH v3 02/17] ARM: mxc: rename gic_handle_irq to avoid name clash Shawn Guo
2011-11-04 16:57 ` [PATCH v3 03/17] ARM: GIC: Add global gic_handle_irq() function Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 04/17] ARM: mxc: convert smp platforms to global gic_handle_irq() Marc Zyngier
2011-11-04 21:15 ` Shawn Guo
2011-11-07 14:01 ` Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 05/17] ARM: highbank: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 18:30 ` Rob Herring
2011-11-04 16:57 ` [PATCH v3 06/17] ARM: RealView: " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 07/17] ARM: VExpress: " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 08/17] ARM: msm: convert SMP platforms " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 09/17] ARM: exynos4: convert " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 10/17] ARM: tegra2: " Marc Zyngier
2011-11-04 19:48 ` Olof Johansson
2011-11-04 16:57 ` [PATCH v3 11/17] ARM: ux500: " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 12/17] ARM: shmobile: convert smp platforms to gic_handle_irq() Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 13/17] ARM: cns3xxx: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 14/17] ARM: zynq: " Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 15/17] ARM: omap2/3: Add global omap2/3_intc_handle_irq() functions Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 16/17] ARM: omap2plus: convert to CONFIG_MULTI_IRQ_HANDLER Marc Zyngier
2011-11-04 16:57 ` [PATCH v3 17/17] ARM: GIC: Make MULTI_IRQ_HANDLER mandatory Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320425871-30564-3-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).