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

Commit 072f5d82 authored by Jan Beulich's avatar Jan Beulich Committed by Thomas Gleixner
Browse files

x86: also show non-zero IRQ counts for vectors that currently don't have a handler 



It doesn't seem to make sense to hide these, even if their counts
can't change at the point in time they're being displayed.

[ tglx: arch/x86 adaptation ]

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 38e760a1

arch/x86/kernel/irq_32.c

+14 −4
Original line number Diff line number Diff line
@@ -255,9 +255,17 @@ int show_interrupts(struct seq_file *p, void *v) 
	}



	if (i < NR_IRQS) {

		unsigned any_count = 0;



		spin_lock_irqsave(&irq_desc[i].lock, flags);

#ifndef CONFIG_SMP

		any_count = kstat_irqs(i);

#else

		for_each_online_cpu(j)

			any_count |= kstat_cpu(j).irqs[i];

#endif

		action = irq_desc[i].action;

		if (!action)

		if (!action && !any_count)

			goto skip;

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

#ifndef CONFIG_SMP
@@ -268,10 +276,12 @@ int show_interrupts(struct seq_file *p, void *v) 
#endif

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

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

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



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

		if (action) {

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

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

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

		}



		seq_putc(p, '\n');

skip:

arch/x86/kernel/irq_64.c

+14 −4
Original line number Diff line number Diff line
@@ -62,9 +62,17 @@ int show_interrupts(struct seq_file *p, void *v) 
	}



	if (i < NR_IRQS) {

		unsigned any_count = 0;



		spin_lock_irqsave(&irq_desc[i].lock, flags);

#ifndef CONFIG_SMP

		any_count = kstat_irqs(i);

#else

		for_each_online_cpu(j)

			any_count |= kstat_cpu(j).irqs[i];

#endif

		action = irq_desc[i].action;

		if (!action) 

		if (!action && !any_count)

			goto skip;

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

#ifndef CONFIG_SMP
@@ -76,9 +84,11 @@ int show_interrupts(struct seq_file *p, void *v) 
		seq_printf(p, " %8s", irq_desc[i].chip->name);

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



		if (action) {

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

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

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

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

		}

		seq_putc(p, '\n');

skip:

		spin_unlock_irqrestore(&irq_desc[i].lock, flags);