Commit 433c9c67 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

powerpc: Use generic show_interrupts() 



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

arch/powerpc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ config PPC 
	select HAVE_SPARSE_IRQ

	select IRQ_PER_CPU

	select GENERIC_HARDIRQS_NO_DEPRECATED

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW_LEVEL



config EARLY_PRINTK

	bool

arch/powerpc/kernel/irq.c

+1 −60
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ notrace void arch_local_irq_restore(unsigned long en) 
EXPORT_SYMBOL(arch_local_irq_restore);

#endif /* CONFIG_PPC64 */



static int show_other_interrupts(struct seq_file *p, int prec)

int arch_show_interrupts(struct seq_file *p, int prec)

{

	int j;
@@ -231,65 +231,6 @@ static int show_other_interrupts(struct seq_file *p, int prec) 
	return 0;

}



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

{

	unsigned long flags, any_count = 0;

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

	struct irqaction *action;

	struct irq_desc *desc;

	struct irq_chip *chip;



	if (i > nr_irqs)

		return 0;



	for (prec = 3, j = 1000; prec < 10 && j <= nr_irqs; ++prec)

		j *= 10;



	if (i == nr_irqs)

		return show_other_interrupts(p, prec);



	/* print header */

	if (i == 0) {

		seq_printf(p, "%*s", prec + 8, "");

		for_each_online_cpu(j)

			seq_printf(p, "CPU%-8d", j);

		seq_putc(p, '\n');

	}



	desc = irq_to_desc(i);

	if (!desc)

		return 0;



	raw_spin_lock_irqsave(&desc->lock, flags);

	for_each_online_cpu(j)

		any_count |= kstat_irqs_cpu(i, j);

	action = desc->action;

	if (!action && !any_count)

		goto out;



	seq_printf(p, "%*d: ", prec, i);

	for_each_online_cpu(j)

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



	chip = get_irq_desc_chip(desc);

	if (chip)

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

	else

		seq_printf(p, "  %-16s", "None");

	seq_printf(p, " %-8s", (irqd_is_level_type(&desc->irq_data) ? "Level" : "Edge");



	if (action) {

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

		while ((action = action->next) != NULL)

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

	}



	seq_putc(p, '\n');

out:

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	return 0;

}



/*

 * /proc/stat helpers

 */