diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-15 07:07:35 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:53:14 -0400 |
commit | 7ef0c30dbf96a8d9a234e90c248eb19df3c031be (patch) | |
tree | e9e77d581e70cee0725ad568d42c0769783f4f89 /arch | |
parent | 81608f3c254512b906ab78082ec5966b376aacd5 (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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/kernel/ints.c | 3 | ||||
-rw-r--r-- | arch/s390/kernel/irq.c | 3 | ||||
-rw-r--r-- | arch/sparc/kernel/irq.c | 4 |
3 files changed, 0 insertions, 10 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 | ||
49 | int nr_irqs = NR_IRQS; | ||
50 | EXPORT_SYMBOL(nr_irqs); | ||
51 | |||
52 | extern u32 auto_irqhandler_fixup[]; | 49 | extern u32 auto_irqhandler_fixup[]; |
53 | extern u32 user_irqhandler_fixup[]; | 50 | extern u32 user_irqhandler_fixup[]; |
54 | extern u16 user_irqvec_fixup[]; | 51 | extern 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 | ||
20 | int nr_irqs = NR_IRQS; | ||
21 | EXPORT_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 | |||
59 | int nr_irqs = NR_IRQS; | ||
60 | EXPORT_SYMBOL(nr_irqs); | ||
61 | |||
62 | unsigned long __raw_local_irq_save(void) | 58 | unsigned long __raw_local_irq_save(void) |
63 | { | 59 | { |
64 | unsigned long retval; | 60 | unsigned long retval; |