From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S945596AbcJSPmv (ORCPT ); Wed, 19 Oct 2016 11:42:51 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47866 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942207AbcJSPms (ORCPT ); Wed, 19 Oct 2016 11:42:48 -0400 Date: Wed, 19 Oct 2016 08:42:42 -0700 From: tip-bot for Renat Valiullin Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, akataria@vmware.com, rvaliullin@vmware.com Reply-To: hpa@zytor.com, mingo@kernel.org, akataria@vmware.com, rvaliullin@vmware.com, tglx@linutronix.de, linux-kernel@vger.kernel.org In-Reply-To: <20161013184539.GA11497@rvaliullin-vm> References: <20161013184539.GA11497@rvaliullin-vm> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/vmware: Skip timer_irq_works() check on VMware Git-Commit-ID: 854dd54245f7f1b1175b1bada613929396a571be 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: 854dd54245f7f1b1175b1bada613929396a571be Gitweb: http://git.kernel.org/tip/854dd54245f7f1b1175b1bada613929396a571be Author: Renat Valiullin AuthorDate: Thu, 13 Oct 2016 11:45:39 -0700 Committer: Thomas Gleixner CommitDate: Wed, 19 Oct 2016 17:36:33 +0200 x86/vmware: Skip timer_irq_works() check on VMware The timer_irq_works() boot check may sometimes fail in a VM, when the Host is overcommitted or when the Guest is running nested. Since the intended check is unnecessary on VMware's virtual hardware, by-pass it. Signed-off-by: Renat Valiullin Acked-by: Alok N Kataria Cc: virtualization@lists.linux-foundation.org Link: http://lkml.kernel.org/r/20161013184539.GA11497@rvaliullin-vm Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/vmware.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 8116057..5130985 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #define CPUID_VMWARE_INFO_LEAF 0x40000000 @@ -94,6 +95,10 @@ static void __init vmware_platform_setup(void) } else { pr_warn("Failed to get TSC freq from the hypervisor\n"); } + +#ifdef CONFIG_X86_IO_APIC + no_timer_check = 1; +#endif } /*