Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70dd4d99 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

genirq: consolidate nr_irqs and for_each_irq_desc() 



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

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 3235e936

include/linux/interrupt.h

+0 −9
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
#include <asm/ptrace.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

 * linux/ioport.h to select the interrupt line behaviour.  When

include/linux/irq.h

+12 −5
Original line number Diff line number Diff line
@@ -11,6 +11,18 @@ 


#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



#include <linux/linkage.h>
@@ -204,11 +216,6 @@ extern struct irq_desc irq_desc[NR_IRQS]; 
extern struct irq_desc *irq_desc;

#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



extern struct irq_desc *sparse_irqs;