summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDavid Howells2006-09-26 08:32:07 +0200
committerLinus Torvalds2006-09-26 17:48:53 +0200
commitaf8c65b57aaa4ae321af34dbfc5ca7f5625263fe (patch)
tree404b7054e52f8cd0a4347649cae8b5ab82fec357 /kernel
parent[PATCH] FRV: improve FRV's use of generic IRQ handling (diff)
downloadkernel-qcow2-linux-af8c65b57aaa4ae321af34dbfc5ca7f5625263fe.tar.gz
kernel-qcow2-linux-af8c65b57aaa4ae321af34dbfc5ca7f5625263fe.tar.xz
kernel-qcow2-linux-af8c65b57aaa4ae321af34dbfc5ca7f5625263fe.zip
[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')
-rw-r--r--kernel/irq/handle.c2
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,
return retval;
}
+#ifndef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ
/**
* __do_IRQ - original all in one highlevel IRQ handler
* @irq: the interrupt number
@@ -253,6 +254,7 @@ out:
return 1;
}
+#endif
#ifdef CONFIG_TRACE_IRQFLAGS