1 files changed, 10 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 1ff0598d309c..81160578b91a 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/apic.h>
 
 #define CPUID_VMWARE_INFO_LEAF  0x40000000
 #define VMWARE_HYPERVISOR_MAGIC 0x564D5868
@@ -82,10 +83,17 @@ static void __init vmware_platform_setup(void)
 
         VMWARE_PORT(GETHZ, eax, ebx, ecx, edx);
 
-        if (ebx != UINT_MAX)
+        if (ebx != UINT_MAX) {
                 x86_platform.calibrate_tsc = vmware_get_tsc_khz;
-        else
+#ifdef CONFIG_X86_LOCAL_APIC
+                /* Skip lapic calibration since we know the bus frequency. */
+                lapic_timer_frequency = ecx / HZ;
+                pr_info("Host bus clock speed read from hypervisor : %u Hz\n",
+                        ecx);
+#endif
+        } else {
                 pr_warn("Failed to get TSC freq from the hypervisor\n");
+        }
 }
 
 /*