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

Commit d52a61c0 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

irq: clean up irq stat methods 



David Miller suggested, related to a kstat_irqs related build breakage:

> Either linux/kernel_stat.h provides the kstat_incr_irqs_this_cpu
> interface or linux/irq.h does, not both.

So move them to kernel_stat.h.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e81838d2

include/linux/irq.h

+0 −6
Original line number Diff line number Diff line
@@ -202,12 +202,6 @@ extern struct irq_desc irq_desc[NR_IRQS]; 
extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);

#endif /* CONFIG_SPARSE_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()]++)





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



static inline struct irq_desc *

include/linux/kernel_stat.h

+6 −3
Original line number Diff line number Diff line
@@ -52,16 +52,19 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq, 
{

	kstat_this_cpu.irqs[irq]++;

}

#endif





#ifndef CONFIG_GENERIC_HARDIRQS

static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)

{

       return kstat_cpu(cpu).irqs[irq];

}

#else

#include <linux/irq.h>

extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);

#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



/*