diff options
author | David Howells <dhowells@redhat.com> | 2006-09-26 02:32:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:53 -0400 |
commit | af8c65b57aaa4ae321af34dbfc5ca7f5625263fe (patch) | |
tree | 404b7054e52f8cd0a4347649cae8b5ab82fec357 /kernel/irq | |
parent | 88d6e19900366781739df033e9c0e2532e715fa5 (diff) |
[PATCH] FRV: permit __do_IRQ() to be dispensed with
Permit __do_IRQ() to be dispensed with based on a configuration option.
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/handle.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 48a53f68af96..4c6cdbaed661 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -154,6 +154,7 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, | |||
154 | return retval; | 154 | return retval; |
155 | } | 155 | } |
156 | 156 | ||
157 | #ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ | ||
157 | /** | 158 | /** |
158 | * __do_IRQ - original all in one highlevel IRQ handler | 159 | * __do_IRQ - original all in one highlevel IRQ handler |
159 | * @irq: the interrupt number | 160 | * @irq: the interrupt number |
@@ -253,6 +254,7 @@ out: | |||
253 | 254 | ||
254 | return 1; | 255 | return 1; |
255 | } | 256 | } |
257 | #endif | ||
256 | 258 | ||
257 | #ifdef CONFIG_TRACE_IRQFLAGS | 259 | #ifdef CONFIG_TRACE_IRQFLAGS |
258 | 260 | ||