Skip to content

Commit

Permalink
arm: Move the set_handle_irq and handle_arch_irq declarations to asm/…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Catalin Marinas committed Mar 26, 2013
1 parent a937536 commit f36a3bb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
5 changes: 5 additions & 0 deletions arch/arm/include/asm/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions arch/arm/include/asm/mach/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion drivers/irqchip/irq-vic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit f36a3bb

Please sign in to comment.