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

Commit 2962156d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 irq fixlet from Ingo Molnar:
 "A single change that hides the 'HYP:' line in /proc/interrupts when
  it's unused"

* 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/irq: Hide 'HYP:' line in /proc/interrupts when not on Xen/Hyper-V
parents 6b2282aa 9d87cd61

arch/x86/kernel/irq.c

+7 −4
Original line number Diff line number Diff line
@@ -139,10 +139,13 @@ int arch_show_interrupts(struct seq_file *p, int prec) 
	seq_puts(p, "  Machine check polls\n");

#endif

#if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)

	if (test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors)) {

		seq_printf(p, "%*s: ", prec, "HYP");

		for_each_online_cpu(j)

		seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);

			seq_printf(p, "%10u ",

				   irq_stats(j)->irq_hv_callback_count);

		seq_puts(p, "  Hypervisor callback interrupts\n");

	}

#endif

	seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));

#if defined(CONFIG_X86_IO_APIC)