aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-15 07:07:35 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:53:14 -0400
commit7ef0c30dbf96a8d9a234e90c248eb19df3c031be (patch)
treee9e77d581e70cee0725ad568d42c0769783f4f89
parent81608f3c254512b906ab78082ec5966b376aacd5 (diff)
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>
-rw-r--r--arch/m68k/kernel/ints.c3
-rw-r--r--arch/s390/kernel/irq.c3
-rw-r--r--arch/sparc/kernel/irq.c4
-rw-r--r--include/linux/interrupt.h8
4 files changed, 5 insertions, 13 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 44169e4cd91d..7e8a0d394e61 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -46,9 +46,6 @@
46#include <asm/q40ints.h> 46#include <asm/q40ints.h>
47#endif 47#endif
48 48
49int nr_irqs = NR_IRQS;
50EXPORT_SYMBOL(nr_irqs);
51
52extern u32 auto_irqhandler_fixup[]; 49extern u32 auto_irqhandler_fixup[];
53extern u32 user_irqhandler_fixup[]; 50extern u32 user_irqhandler_fixup[];
54extern u16 user_irqvec_fixup[]; 51extern u16 user_irqvec_fixup[];
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 3624c4a0037a..e7c5bfb7c755 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -17,9 +17,6 @@
17#include <linux/proc_fs.h> 17#include <linux/proc_fs.h>
18#include <linux/profile.h> 18#include <linux/profile.h>
19 19
20int nr_irqs = NR_IRQS;
21EXPORT_SYMBOL(nr_irqs);
22
23/* 20/*
24 * show_interrupts is needed by /proc/interrupts. 21 * show_interrupts is needed by /proc/interrupts.
25 */ 22 */
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 4b99e3ce3916..93e1d1c65290 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -55,10 +55,6 @@
55#define SMP_NOP2 55#define SMP_NOP2
56#define SMP_NOP3 56#define SMP_NOP3
57#endif /* SMP */ 57#endif /* SMP */
58
59int nr_irqs = NR_IRQS;
60EXPORT_SYMBOL(nr_irqs);
61
62unsigned long __raw_local_irq_save(void) 58unsigned long __raw_local_irq_save(void)
63{ 59{
64 unsigned long retval; 60 unsigned long retval;
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 @@
15#include <asm/ptrace.h> 15#include <asm/ptrace.h>
16#include <asm/system.h> 16#include <asm/system.h>
17 17
18extern int nr_irqs;
19
20#ifndef CONFIG_GENERIC_HARDIRQS 18#ifndef CONFIG_GENERIC_HARDIRQS
21#define for_each_irq_desc(irq, desc) \ 19# define for_each_irq_desc(irq, desc) \
22 for (irq = 0; irq < nr_irqs; irq++) 20 for (irq = 0; irq < nr_irqs; irq++)
21
22# define nr_irqs NR_IRQS
23#else
24extern int nr_irqs;
23#endif 25#endif
24 26
25/* 27/*