hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ARM] Fix circular include dependency with IRQ headers 

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2008-08-03 15:04:04 +01:00 committed by Russell King
parent bccf650270
commit 897d85275d
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/include/asm/hw_irq.h
View File

@ -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

20
arch/arm/include/asm/mach/irq.h
View File

@ -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 { \
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

1
arch/arm/kernel/irq.c
View File

@ -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>
/* /*