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

Commit f36a3bb1 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

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: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarMarc 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>
parent a937536b

arch/arm/include/asm/irq.h

+5 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/include/asm/mach/irq.h

+0 −5
Original line number Diff line number Diff line
@@ -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

 */

drivers/irqchip/irq-vic.c

+1 −1
Original line number Diff line number Diff line
@@ -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"