diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-15 01:55:58 +0000 |
| commit | 53b3988d474435254a3b053a68bb24ce9e439295 (patch) | |
| tree | f8da8e40f01f4ad02bbd76b8c9920749b118235f /arch/sh/kernel/irq.c | |
| parent | b0cb48abe83d1a4389ea938bf624f8baa82c5047 (diff) | |
Merge with 2.3.99-pre9.
Diffstat (limited to 'arch/sh/kernel/irq.c')
| -rw-r--r-- | arch/sh/kernel/irq.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index c989796d7..b7d01e9a2 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c @@ -13,6 +13,7 @@ * Naturally it's not a 1:1 relation, but there are similarities. */ +#include <linux/config.h> #include <linux/ptrace.h> #include <linux/errno.h> #include <linux/kernel_stat.h> @@ -300,7 +301,7 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5, desc->handler->end(irq); spin_unlock(&irq_controller_lock); -#if 1 +#if 0 __sti(); #endif if (softirq_state[cpu].active&softirq_state[cpu].mask) @@ -513,3 +514,10 @@ int setup_irq(unsigned int irq, struct irqaction * new) spin_unlock_irqrestore(&irq_controller_lock,flags); return 0; } + +#if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL) + +void init_irq_proc(void) +{ +} +#endif |