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

Commit 517e4981 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Use generic show_interrupts 



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

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ config X86 
	select HAVE_SPARSE_IRQ

	select GENERIC_IRQ_PROBE

	select GENERIC_PENDING_IRQ if SMP

	select GENERIC_IRQ_SHOW

	select USE_GENERIC_SMP_HELPERS if SMP



config INSTRUCTION_DECODER

arch/x86/kernel/irq.c

+2 −55
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ void ack_bad_irq(unsigned int irq) 


#define irq_stats(x)		(&per_cpu(irq_stat, x))

/*

 * /proc/interrupts printing:

 * /proc/interrupts printing for arch specific interrupts

 */

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

int arch_show_interrupts(struct seq_file *p, int prec)

{

	int j;
@@ -122,59 +122,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;



	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));

	seq_printf(p, " %8s", desc->irq_data.chip->name);

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



	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

 */