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

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

sparseirq: use kstat_irqs_cpu instead 



Impact: build fix

Ingo Molnar wrote:

> tip/arch/blackfin/kernel/irqchip.c: In function 'show_interrupts':
> tip/arch/blackfin/kernel/irqchip.c:85: error: 'struct kernel_stat' has no member named 'irqs'
> make[2]: *** [arch/blackfin/kernel/irqchip.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
>

So could move kstat_irqs array to irq_desc struct.

(s390, m68k, sparc) are not touched yet, because they don't support genirq

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

arch/blackfin/kernel/irqchip.c

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

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

		for_each_online_cpu(j)

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

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

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

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

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

arch/frv/kernel/irq.c

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

			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;

arch/h8300/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ asmlinkage void do_IRQ(int irq) 
#if defined(CONFIG_PROC_FS)

int show_interrupts(struct seq_file *p, void *v)

{

	int i = *(loff_t *) v, j;

	int i = *(loff_t *) v;

	struct irqaction * action;

	unsigned long flags;
@@ -196,7 +196,7 @@ int show_interrupts(struct seq_file *p, void *v) 
		if (!action)

			goto unlock;

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

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

		seq_printf(p, "%10u ", kstat_irqs(i));

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

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

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

arch/ia64/kernel/irq.c

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

#else

		for_each_online_cpu(j) {

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

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

		}

#endif

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

arch/m32r/kernel/irq.c

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

#else

		for_each_online_cpu(j)

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

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

#endif

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

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