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

Commit f9af0e70 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Ingo Molnar
Browse files

irq: for_each_irq_desc() move to irqnr.h 



Impact: cleanup

before CONFIG_SPARSE_IRQ age, for_each_irq_desc() sat in irqnr.h and
could be called from generic code.

CONFIG_SPARSE_IRQ breaks this assumption, but SPARSE_IRQ version
for_each_irq_desc() also can move into irqnr.h easily.

Also, this patch unifies CONFIG_SPARSE_IRQ and !CONFIG_SPARSE_IRQ
for_each_irq_desc().

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 51bc39f4

include/linux/irq.h

+4 −20
Original line number Diff line number Diff line
@@ -202,33 +202,17 @@ extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc 


#ifndef CONFIG_SPARSE_IRQ

extern struct irq_desc irq_desc[NR_IRQS];



static inline struct irq_desc *irq_to_desc(unsigned int irq)

{

	return (irq < NR_IRQS) ? irq_desc + irq : NULL;

}

static inline struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu)

{

	return irq_to_desc(irq);

}



#else



extern struct irq_desc *irq_to_desc(unsigned int irq);

extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);

#else /* CONFIG_SPARSE_IRQ */

extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);



# define for_each_irq_desc(irq, desc)		\

	for (irq = 0, desc = irq_to_desc(irq); irq < nr_irqs; irq++, desc = irq_to_desc(irq))

# define for_each_irq_desc_reverse(irq, desc)                          \

	for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq >= 0; irq--, desc = irq_to_desc(irq))



#define kstat_irqs_this_cpu(DESC) \

	((DESC)->kstat_irqs[smp_processor_id()])

#define kstat_incr_irqs_this_cpu(irqno, DESC) \

	((DESC)->kstat_irqs[smp_processor_id()]++)



#endif

#endif /* CONFIG_SPARSE_IRQ */



extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);



static inline struct irq_desc *

irq_remap_to_desc(unsigned int irq, struct irq_desc *desc)

include/linux/irqnr.h

+9 −10
Original line number Diff line number Diff line
@@ -15,20 +15,19 @@ 


# define for_each_irq_desc_reverse(irq, desc)                          \

	for (irq = nr_irqs - 1; irq >= 0; irq--)

#else

#else /* CONFIG_GENERIC_HARDIRQS */



extern int nr_irqs;

extern struct irq_desc *irq_to_desc(unsigned int irq);



#ifndef CONFIG_SPARSE_IRQ



struct irq_desc;

# define for_each_irq_desc(irq, desc)					\

	for (irq = 0, desc = irq_desc; irq < nr_irqs; irq++, desc++)

	for (irq = 0, desc = irq_to_desc(irq); irq < nr_irqs;		\

	     irq++, desc = irq_to_desc(irq))

# define for_each_irq_desc_reverse(irq, desc)				\

	for (irq = nr_irqs - 1, desc = irq_desc + (nr_irqs - 1);        \

	    irq >= 0; irq--, desc--)

#endif

#endif

	for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq >= 0;	\

	     irq--, desc = irq_to_desc(irq))



#endif /* CONFIG_GENERIC_HARDIRQS */



#define for_each_irq_nr(irq)                   \

       for (irq = 0; irq < nr_irqs; irq++)

kernel/irq/handle.c

+11 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu) 
	return desc;

}



#else

#else /* !CONFIG_SPARSE_IRQ */



struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {

	[0 ... NR_IRQS-1] = {
@@ -218,7 +218,16 @@ struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = { 
	}

};



#endif

struct irq_desc *irq_to_desc(unsigned int irq)

{

	return (irq < NR_IRQS) ? irq_desc + irq : NULL;

}



struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu)

{

	return irq_to_desc(irq);

}

#endif /* !CONFIG_SPARSE_IRQ */



/*

 * What should we do if we get a hw irq event on an illegal vector?