diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-03 16:04:04 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 10:39:37 +0200 |
| commit | 897d85275d7f061ff0ec838bd5224a9e76ad07d6 (patch) | |
| tree | 3389a9f0e5c25732f81bbda6e6a38c7131ab36b8 /arch/arm | |
| parent | [ARM] Fix explicit asm(-arm)?/arch-foo references (diff) | |
| download | linux-897d85275d7f061ff0ec838bd5224a9e76ad07d6.tar.xz linux-897d85275d7f061ff0ec838bd5224a9e76ad07d6.zip | |
[ARM] Fix circular include dependency with IRQ headers
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/hw_irq.h | 20 | ||||
| -rw-r--r-- | arch/arm/include/asm/mach/irq.h | 20 | ||||
| -rw-r--r-- | arch/arm/kernel/irq.c | 1 |
3 files changed, 20 insertions, 21 deletions
diff --git a/arch/arm/include/asm/hw_irq.h b/arch/arm/include/asm/hw_irq.h index f1a08a500604..90831f6f5f5c 100644 --- a/arch/arm/include/asm/hw_irq.h +++ b/arch/arm/include/asm/hw_irq.h @@ -4,6 +4,24 @@ #ifndef _ARCH_ARM_HW_IRQ_H #define _ARCH_ARM_HW_IRQ_H -#include <asm/mach/irq.h> +static inline void ack_bad_irq(int irq) +{ + extern unsigned long irq_err_count; + irq_err_count++; +} + +/* + * Obsolete inline function for calling irq descriptor handlers. + */ +static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) +{ + desc->handle_irq(irq, desc); +} + +void set_irq_flags(unsigned int irq, unsigned int flags); + +#define IRQF_VALID (1 << 0) +#define IRQF_PROBE (1 << 1) +#define IRQF_NOAUTOEN (1 << 2) #endif diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h index c57b52ce574a..acac5302e4ea 100644 --- a/arch/arm/include/asm/mach/irq.h +++ b/arch/arm/include/asm/mach/irq.h @@ -22,20 +22,6 @@ extern void init_FIQ(void); extern int show_fiq_list(struct seq_file *, void *); /* - * Obsolete inline function for calling irq descriptor handlers. - */ -static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) -{ - desc->handle_irq(irq, desc); -} - -void set_irq_flags(unsigned int irq, unsigned int flags); - -#define IRQF_VALID (1 << 0) -#define IRQF_PROBE (1 << 1) -#define IRQF_NOAUTOEN (1 << 2) - -/* * This is for easy migration, but should be changed in the source */ #define do_bad_IRQ(irq,desc) \ @@ -45,10 +31,4 @@ do { \ spin_unlock(&desc->lock); \ } while(0) -extern unsigned long irq_err_count; -static inline void ack_bad_irq(int irq) -{ - irq_err_count++; -} - #endif diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 11dcd52e51be..f88efb135b70 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -38,6 +38,7 @@ #include <linux/proc_fs.h> #include <asm/system.h> +#include <asm/mach/irq.h> #include <asm/mach/time.h> /* |