diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 10:05:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 10:05:44 -0700 |
| commit | 2962156d5cc0e7f959353d3f5275da7cc3765f06 (patch) | |
| tree | 3c3ecc9ed9fec7268b66ef0b345ef265b2792cc1 | |
| parent | 6b2282aa372665c14ea1100b63ac0703051407e9 (diff) | |
| parent | 9d87cd61a6b71ee00b7576a3ebc10208becdbea1 (diff) | |
| download | linux-2962156d5cc0e7f959353d3f5275da7cc3765f06.tar.gz linux-2962156d5cc0e7f959353d3f5275da7cc3765f06.tar.xz | |
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
| -rw-r--r-- | arch/x86/kernel/irq.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 4616672a4049..ae00b355114d 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -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) - seq_printf(p, "%*s: ", prec, "HYP"); - for_each_online_cpu(j) - seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count); - seq_puts(p, " Hypervisor callback interrupts\n"); + 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_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) |