Commit 854dd542 authored by Renat Valiullin's avatar Renat Valiullin Committed by Thomas Gleixner

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: default avatarRenat Valiullin <rvaliullin@vmware.com>
Acked-by: default avatarAlok N Kataria <akataria@vmware.com>
Cc: virtualization@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/20161013184539.GA11497@rvaliullin-vmSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1a1891d7
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/x86_init.h> #include <asm/x86_init.h>
#include <asm/hypervisor.h> #include <asm/hypervisor.h>
#include <asm/timer.h>
#include <asm/apic.h> #include <asm/apic.h>
#define CPUID_VMWARE_INFO_LEAF 0x40000000 #define CPUID_VMWARE_INFO_LEAF 0x40000000
...@@ -94,6 +95,10 @@ static void __init vmware_platform_setup(void) ...@@ -94,6 +95,10 @@ static void __init vmware_platform_setup(void)
} else { } else {
pr_warn("Failed to get TSC freq from the hypervisor\n"); pr_warn("Failed to get TSC freq from the hypervisor\n");
} }
#ifdef CONFIG_X86_IO_APIC
no_timer_check = 1;
#endif
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment