summaryrefslogtreecommitdiff
path: root/include/linux/interrupt.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-15 13:07:35 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:14 +0200
commit7ef0c30dbf96a8d9a234e90c248eb19df3c031be (patch)
treee9e77d581e70cee0725ad568d42c0769783f4f89 /include/linux/interrupt.h
parent81608f3c254512b906ab78082ec5966b376aacd5 (diff)
downloadlwn-7ef0c30dbf96a8d9a234e90c248eb19df3c031be.tar.gz
lwn-7ef0c30dbf96a8d9a234e90c248eb19df3c031be.zip
genirq: define nr_irqs for architectures with GENERIC_HARDIRQS=n
Revert the sparse irq changes in m68k/s390/sparc and just define nr_irqs as NR_IRQS for those architectures. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/interrupt.h')
-rw-r--r--include/linux/interrupt.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index d4039a0b23f4..5a57df2ee922 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -15,11 +15,13 @@
#include <asm/ptrace.h>
#include <asm/system.h>
-extern int nr_irqs;
-
#ifndef CONFIG_GENERIC_HARDIRQS
-#define for_each_irq_desc(irq, desc) \
+# define for_each_irq_desc(irq, desc) \
for (irq = 0; irq < nr_irqs; irq++)
+
+# define nr_irqs NR_IRQS
+#else
+extern int nr_irqs;
#endif
/*