| Message ID | 1363714703-9629-2-git-send-email-catalin.marinas@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Catalin, On 03/19/2013 01:38 PM, Catalin Marinas wrote: > This patch prepares the removal of <asm/mach/irq.h> include in the > GIC and VIC irqchip drivers. [...] > 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" I'm seeing implicit declaration of function issues using your soc-armv8-model branch that seem to be caused by this change. drivers/irqchip/irq-vic.c: In function ‘vic_irqdomain_map’: drivers/irqchip/irq-vic.c:200:2: error: implicit declaration of function ‘irq_set_chip_and_handler’ [-Werror=implicit-function-declaration] drivers/irqchip/irq-vic.c:200:43: error: ‘handle_level_irq’ undeclared (first use in this function) etc. Explicitly including linux/irq.h fixed the issue for me. Regards, Christopher
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"
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(-)