From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935227AbcJQTFd (ORCPT ); Mon, 17 Oct 2016 15:05:33 -0400 Received: from 67-148-5-81.dia.static.qwest.net ([67.148.5.81]:61206 "EHLO rvaliullin-vm.localdomain" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S938753AbcJQTEu (ORCPT ); Mon, 17 Oct 2016 15:04:50 -0400 Date: Thu, 13 Oct 2016 11:45:39 -0700 From: Renat Valiullin To: Alok Kataria , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86/vmware: Skip timer_irq_works() check on VMware Message-ID: <20161013184539.GA11497@rvaliullin-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, this change by-passes it. Signed-off-by: Renat Valiullin Acked-by: Alok N Kataria --- 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 } /* -- 2.7.4