lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genirq: consolidate nr_irqs and for_each_irq_desc()

Browse Source 
Move all of those to linux/irq.h where they belong.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2008-10-15 15:39:27 +02:00
committed by Ingo Molnar
parent 3235e936c0
commit 70dd4d992a
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/interrupt.h
View File

@@ -15,15 +15,6 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/system.h> #include <asm/system.h>
#ifndef CONFIG_GENERIC_HARDIRQS
# 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
/* /*
* These correspond to the IORESOURCE_IRQ_* defines in * These correspond to the IORESOURCE_IRQ_* defines in
* linux/ioport.h to select the interrupt line behaviour. When * linux/ioport.h to select the interrupt line behaviour. When

17
include/linux/irq.h
View File

@@ -11,6 +11,18 @@
#include <linux/smp.h> #include <linux/smp.h>
#ifndef CONFIG_GENERIC_HARDIRQS
# define nr_irqs NR_IRQS
# define for_each_irq_desc(irq, desc) \
for (irq = 0; irq < nr_irqs; irq++)
#else
extern int nr_irqs;
# define for_each_irq_desc(irq, desc) \
for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)
#endif
#ifndef CONFIG_S390 #ifndef CONFIG_S390
#include <linux/linkage.h> #include <linux/linkage.h>
@@ -204,11 +216,6 @@ extern struct irq_desc irq_desc[NR_IRQS];
extern struct irq_desc *irq_desc; extern struct irq_desc *irq_desc;
#endif #endif
#ifdef CONFIG_GENERIC_HARDIRQS
#define for_each_irq_desc(irq, desc) \
for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc = &irq_desc[irq])
#endif
#else #else
extern struct irq_desc *sparse_irqs; extern struct irq_desc *sparse_irqs;