Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.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>
Tested-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Rob Herring <rob.herring@calxeda.com>

+6 -6
+5
arch/arm/include/asm/irq.h
··· 30 30 void handle_IRQ(unsigned int, struct pt_regs *); 31 31 void init_IRQ(void); 32 32 33 + #ifdef CONFIG_MULTI_IRQ_HANDLER 34 + extern void (*handle_arch_irq)(struct pt_regs *); 35 + extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); 36 + #endif 37 + 33 38 #endif 34 39 35 40 #endif
-5
arch/arm/include/asm/mach/irq.h
··· 20 20 extern void init_FIQ(int); 21 21 extern int show_fiq_list(struct seq_file *, int); 22 22 23 - #ifdef CONFIG_MULTI_IRQ_HANDLER 24 - extern void (*handle_arch_irq)(struct pt_regs *); 25 - extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); 26 - #endif 27 - 28 23 /* 29 24 * This is for easy migration, but should be changed in the source 30 25 */
+1 -1
drivers/irqchip/irq-vic.c
··· 33 33 #include <linux/irqchip/arm-vic.h> 34 34 35 35 #include <asm/exception.h> 36 - #include <asm/mach/irq.h> 36 + #include <asm/irq.h> 37 37 38 38 #include "irqchip.h" 39 39