openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2008-10-15 13:07:35 +02:00 committed by Ingo Molnar
parent 81608f3c25
commit 7ef0c30dbf
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/m68k/kernel/ints.c
View File

@ -46,9 +46,6 @@
#include <asm/q40ints.h> #include <asm/q40ints.h>
#endif #endif
int nr_irqs = NR_IRQS;
EXPORT_SYMBOL(nr_irqs);
extern u32 auto_irqhandler_fixup[]; extern u32 auto_irqhandler_fixup[];
extern u32 user_irqhandler_fixup[]; extern u32 user_irqhandler_fixup[];
extern u16 user_irqvec_fixup[]; extern u16 user_irqvec_fixup[];

3
arch/s390/kernel/irq.c
View File

@ -17,9 +17,6 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/profile.h> #include <linux/profile.h>
int nr_irqs = NR_IRQS;
EXPORT_SYMBOL(nr_irqs);
/* /*
* show_interrupts is needed by /proc/interrupts. * show_interrupts is needed by /proc/interrupts.
*/ */

4
arch/sparc/kernel/irq.c
View File

@ -55,10 +55,6 @@
#define SMP_NOP2 #define SMP_NOP2
#define SMP_NOP3 #define SMP_NOP3
#endif /* SMP */ #endif /* SMP */
int nr_irqs = NR_IRQS;
EXPORT_SYMBOL(nr_irqs);
unsigned long __raw_local_irq_save(void) unsigned long __raw_local_irq_save(void)
{ {
unsigned long retval; unsigned long retval;

8
include/linux/interrupt.h
View File

@ -15,11 +15,13 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/system.h> #include <asm/system.h>
extern int nr_irqs;
#ifndef CONFIG_GENERIC_HARDIRQS #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++) for (irq = 0; irq < nr_irqs; irq++)
# define nr_irqs NR_IRQS
#else
extern int nr_irqs;
#endif #endif
/* /*