From: catalin.marinas@arm.com (Catalin Marinas)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/4] arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h
Date: Wed, 23 Jan 2013 17:59:31 +0000 [thread overview]
Message-ID: <1358963974-5496-2-git-send-email-catalin.marinas@arm.com> (raw)
In-Reply-To: <1358963974-5496-1-git-send-email-catalin.marinas@arm.com>
This patch prepares the removal of <asm/mach/irq.h> include in the
GIC and VIC irqchip drivers.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/include/asm/irq.h | 5 +++++
arch/arm/include/asm/mach/irq.h | 5 -----
drivers/irqchip/irq-vic.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
index 35c21c3..53c15de 100644
--- a/arch/arm/include/asm/irq.h
+++ b/arch/arm/include/asm/irq.h
@@ -30,6 +30,11 @@ extern void asm_do_IRQ(unsigned int, struct pt_regs *);
void handle_IRQ(unsigned int, struct pt_regs *);
void init_IRQ(void);
+#ifdef CONFIG_MULTI_IRQ_HANDLER
+extern void (*handle_arch_irq)(struct pt_regs *);
+extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
+#endif
+
#endif
#endif
diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h
index 18c8830..749d505 100644
--- a/arch/arm/include/asm/mach/irq.h
+++ b/arch/arm/include/asm/mach/irq.h
@@ -20,11 +20,6 @@ struct seq_file;
extern void init_FIQ(int);
extern int show_fiq_list(struct seq_file *, int);
-#ifdef CONFIG_MULTI_IRQ_HANDLER
-extern void (*handle_arch_irq)(struct pt_regs *);
-extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
-#endif
-
/*
* This is for easy migration, but should be changed in the source
*/
diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c
index 3cf97aa..e38cb00 100644
--- a/drivers/irqchip/irq-vic.c
+++ b/drivers/irqchip/irq-vic.c
@@ -33,7 +33,7 @@
#include <linux/irqchip/arm-vic.h>
#include <asm/exception.h>
-#include <asm/mach/irq.h>
+#include <asm/irq.h>
#include "irqchip.h"
next prev parent reply other threads:[~2013-01-23 17:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 17:59 [PATCH 0/4] Preparatory GIC patches for arm64 support Catalin Marinas
2013-01-23 17:59 ` Catalin Marinas [this message]
2013-01-23 17:59 ` [PATCH 2/4] arm: Move chained_irq_(enter|exit) to a generic file Catalin Marinas
2013-01-24 5:32 ` Santosh Shilimkar
2013-01-24 17:29 ` Catalin Marinas
2013-01-25 7:00 ` Santosh Shilimkar
2013-01-23 17:59 ` [PATCH 3/4] irqchip: gic: Call handle_bad_irq() directly Catalin Marinas
2013-01-23 17:59 ` [PATCH 4/4] irqchip: gic: Perform the gic_secondary_init() call via CPU notifier Catalin Marinas
2013-01-23 18:28 ` Stephen Warren
2013-01-24 2:15 ` Viresh Kumar
2013-01-24 5:33 ` Santosh Shilimkar
2013-01-24 17:51 ` Rob Herring
2013-01-25 4:30 ` Simon Horman
2013-01-25 9:25 ` Catalin Marinas
2013-01-28 1:03 ` Simon Horman
2013-01-25 11:25 ` Srinidhi Kasagar
2013-01-25 16:16 ` Dinh Nguyen
2013-01-25 18:12 ` Catalin Marinas
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=1358963974-5496-2-git-send-email-catalin.marinas@arm.com \
--to=catalin.marinas@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).