From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934817AbbGHJrH (ORCPT ); Wed, 8 Jul 2015 05:47:07 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46848 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934478AbbGHJq6 (ORCPT ); Wed, 8 Jul 2015 05:46:58 -0400 Date: Wed, 8 Jul 2015 02:46:23 -0700 From: tip-bot for Vitaly Kuznetsov Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, vkuznets@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, rkrcmar@redhat.com, peterz@infradead.org, drjones@redhat.com Reply-To: drjones@redhat.com, peterz@infradead.org, linux-kernel@vger.kernel.org, rkrcmar@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, vkuznets@redhat.com In-Reply-To: <1436286373-11908-1-git-send-email-vkuznets@redhat.com> References: <1436286373-11908-1-git-send-email-vkuznets@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/irq] x86/irq: Hide 'HYP:' line in /proc/ interrupts when not on Xen/Hyper-V Git-Commit-ID: 9d87cd61a6b71ee00b7576a3ebc10208becdbea1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 9d87cd61a6b71ee00b7576a3ebc10208becdbea1 Gitweb: http://git.kernel.org/tip/9d87cd61a6b71ee00b7576a3ebc10208becdbea1 Author: Vitaly Kuznetsov AuthorDate: Tue, 7 Jul 2015 18:26:13 +0200 Committer: Ingo Molnar CommitDate: Wed, 8 Jul 2015 11:18:34 +0200 x86/irq: Hide 'HYP:' line in /proc/interrupts when not on Xen/Hyper-V Hypervisor callback interrupts are only accounted on Xen/Hyper-V. There is no point in having always-zero HYP: line on other hypervisors or bare metal. Print the line only if HYPERVISOR_CALLBACK_VECTOR was allocated. Reported-by: Radim Krčmář Signed-off-by: Vitaly Kuznetsov Cc: Andrew Jones Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1436286373-11908-1-git-send-email-vkuznets@redhat.com Signed-off-by: Ingo Molnar --- 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 88b36648..5b53747 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)