Commit 897d8527 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Fix circular include dependency with IRQ headers


Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bccf6502
...@@ -4,6 +4,24 @@ ...@@ -4,6 +4,24 @@
#ifndef _ARCH_ARM_HW_IRQ_H #ifndef _ARCH_ARM_HW_IRQ_H
#define _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 #endif
...@@ -21,20 +21,6 @@ extern void (*init_arch_irq)(void); ...@@ -21,20 +21,6 @@ extern void (*init_arch_irq)(void);
extern void init_FIQ(void); extern void init_FIQ(void);
extern int show_fiq_list(struct seq_file *, 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 * This is for easy migration, but should be changed in the source
*/ */
...@@ -45,10 +31,4 @@ do { \ ...@@ -45,10 +31,4 @@ do { \
spin_unlock(&desc->lock); \ spin_unlock(&desc->lock); \
} while(0) } while(0)
extern unsigned long irq_err_count;
static inline void ack_bad_irq(int irq)
{
irq_err_count++;
}
#endif #endif
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
/* /*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment