Commit-ID: 854dd54245f7f1b1175b1bada613929396a571be Gitweb: http://git.kernel.org/tip/854dd54245f7f1b1175b1bada613929396a571be Author: Renat Valiullin <rvaliul...@vmware.com> AuthorDate: Thu, 13 Oct 2016 11:45:39 -0700 Committer: Thomas Gleixner <t...@linutronix.de> 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 <rvaliul...@vmware.com> Acked-by: Alok N Kataria <akata...@vmware.com> Cc: virtualizat...@lists.linux-foundation.org Link: http://lkml.kernel.org/r/20161013184539.GA11497@rvaliullin-vm Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- 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 <asm/div64.h> #include <asm/x86_init.h> #include <asm/hypervisor.h> +#include <asm/timer.h> #include <asm/apic.h> #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 } /*
