Messages in this thread Patch in this message | | | Date | Mon, 31 Aug 2015 19:49:35 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL] x86/irq change for v4.3 |
| |
Linus,
Please pull the latest x86-irq-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-irq-for-linus
# HEAD: 9d87cd61a6b71ee00b7576a3ebc10208becdbea1 x86/irq: Hide 'HYP:' line in /proc/interrupts when not on Xen/Hyper-V
A single change that hides the 'HYP:' line in /proc/interrupts when it's unused.
Thanks,
Ingo
------------------> Vitaly Kuznetsov (1): x86/irq: Hide 'HYP:' line in /proc/interrupts when not on Xen/Hyper-V
arch/x86/kernel/irq.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 88b366487b0e..5b537479de83 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)
| |