1 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 08be922de33a..de3f4e0ce8eb 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -23,6 +23,7 @@
 
 #include <asm/processor.h>
 #include <asm/vmware.h>
+#include <asm/mshyperv.h>
 #include <asm/hypervisor.h>
 
 static inline void __cpuinit
@@ -30,6 +31,8 @@ detect_hypervisor_vendor(struct cpuinfo_x86 *c)
 {
         if (vmware_platform())
                 c->x86_hyper_vendor = X86_HYPER_VENDOR_VMWARE;
+        else if (ms_hyperv_platform())
+                c->x86_hyper_vendor = X86_HYPER_VENDOR_MSFT;
         else
                 c->x86_hyper_vendor = X86_HYPER_VENDOR_NONE;
 }
@@ -37,10 +40,11 @@ detect_hypervisor_vendor(struct cpuinfo_x86 *c)
 static inline void __cpuinit
 hypervisor_set_feature_bits(struct cpuinfo_x86 *c)
 {
-        if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_VMWARE) {
+        if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_VMWARE)
                 vmware_set_feature_bits(c);
-                return;
-        }
+        else if (boot_cpu_data.x86_hyper_vendor == X86_HYPER_VENDOR_MSFT)
+                ms_hyperv_set_feature_bits(c);
+        return;
 }
 
 void __cpuinit init_hypervisor(struct cpuinfo_x86 *c)