diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /include/linux/irq.h | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'include/linux/irq.h')
| -rw-r--r-- | include/linux/irq.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 4063fe743..f8a16d730 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -42,7 +42,7 @@ typedef struct { independent code */ struct irqaction *action; /* IRQ action list */ unsigned int depth; /* Disable depth for nested irq disables */ -} irq_desc_t; +} ____cacheline_aligned irq_desc_t; #include <asm/hw_irq.h> /* the arch dependent stuff */ @@ -52,27 +52,6 @@ extern int handle_IRQ_event(unsigned int, struct pt_regs *, struct irqaction *); extern spinlock_t irq_controller_lock; extern int setup_irq(unsigned int , struct irqaction * ); -#ifdef __SMP__ - -#include <asm/atomic.h> - -static inline void irq_enter(int cpu, unsigned int irq) -{ - hardirq_enter(cpu); - while (test_bit(0,&global_irq_lock)) { - /* nothing */; - } -} - -static inline void irq_exit(int cpu, unsigned int irq) -{ - hardirq_exit(cpu); -} -#else -#define irq_enter(cpu, irq) (++local_irq_count[cpu]) -#define irq_exit(cpu, irq) (--local_irq_count[cpu]) -#endif - extern hw_irq_controller no_irq_type; /* needed in every arch ? */ #endif /* __asm_h */ |