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

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

sparseirq: use kstat_irqs_cpu on non-x86 architectures too 



so we could move kstat_irqs array to irq_desc struct.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d178a1eb

arch/alpha/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ show_interrupts(struct seq_file *p, void *v) 
		seq_printf(p, "%10u ", kstat_irqs(irq));

#else

		for_each_online_cpu(j)

			seq_printf(p, "%10u ", kstat_cpu(j).irqs[irq]);

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));

#endif

		seq_printf(p, " %14s", irq_desc[irq].chip->typename);

		seq_printf(p, "  %c%s",

arch/alpha/kernel/irq_alpha.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ do_entInt(unsigned long type, unsigned long vector, 
		smp_percpu_timer_interrupt(regs);

		cpu = smp_processor_id();

		if (cpu != boot_cpuid) {

		        kstat_cpu(cpu).irqs[RTC_IRQ]++;

		        kstat_incr_irqs_this_cpu(RTC_IRQ, irq_to_desc(RTC_IRQ));

		} else {

			handle_irq(RTC_IRQ);

		}

arch/arm/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int show_interrupts(struct seq_file *p, void *v) 


		seq_printf(p, "%3d: ", i);

		for_each_present_cpu(cpu)

			seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));

		seq_printf(p, " %10s", irq_desc[i].chip->name ? : "-");

		seq_printf(p, "  %s", action->name);

		for (action = action->next; action; action = action->next)

arch/arm/mach-ns9xxx/irq.c

+1 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static struct irq_chip ns9xxx_chip = { 
#else

static void handle_prio_irq(unsigned int irq, struct irq_desc *desc)

{

	unsigned int cpu = smp_processor_id();

	struct irqaction *action;

	irqreturn_t action_ret;
@@ -72,7 +71,7 @@ static void handle_prio_irq(unsigned int irq, struct irq_desc *desc) 
	BUG_ON(desc->status & IRQ_INPROGRESS);



	desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);

	kstat_cpu(cpu).irqs[irq]++;

	kstat_incr_irqs_this_cpu(irq, desc);



	action = desc->action;

	if (unlikely(!action || (desc->status & IRQ_DISABLED)))

arch/avr32/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ int show_interrupts(struct seq_file *p, void *v) 


		seq_printf(p, "%3d: ", i);

		for_each_online_cpu(cpu)

			seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[i]);

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, cpu));

		seq_printf(p, " %8s", irq_desc[i].chip->name ? : "-");

		seq_printf(p, "  %s", action->name);

		for (action = action->next; action; action = action->next)