[PATCH] x86/vmware: Skip timer_irq_works() check on VMware
flat view
DORMANTno replies
REVIEWED: 1 (0M)
From: Renat Valiullin <hidden>
Date: 2016-10-17 19:05:33
Also in:
lkml
Subsystem:
the rest, vmware hypervisor interface, x86 architecture (32-bit and 64-bit) · Maintainers:
Linus Torvalds, Ajay Kaher, Alexey Makhalov, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
1 review trailer.
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 <redacted> Acked-by: Alok N Kataria <redacted> --- 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 } /*
--
2.7.4