hv: vmbus_drv: detect hyperv through x86_hyper
[linux-3.10.git] / drivers / hv / vmbus_drv.c
index f40dd57..8e1a9ec 100644 (file)
@@ -34,6 +34,7 @@
 #include <linux/completion.h>
 #include <linux/hyperv.h>
 #include <asm/hyperv.h>
+#include <asm/hypervisor.h>
 #include "hyperv_vmbus.h"
 
 
@@ -719,33 +720,11 @@ static struct acpi_driver vmbus_acpi_driver = {
        },
 };
 
-/*
- * query_hypervisor_presence
- * - Query the cpuid for presence of windows hypervisor
- */
-static int query_hypervisor_presence(void)
-{
-       unsigned int eax;
-       unsigned int ebx;
-       unsigned int ecx;
-       unsigned int edx;
-       unsigned int op;
-
-       eax = 0;
-       ebx = 0;
-       ecx = 0;
-       edx = 0;
-       op = HVCPUID_VERSION_FEATURES;
-       cpuid(op, &eax, &ebx, &ecx, &edx);
-
-       return ecx & HV_PRESENT_BIT;
-}
-
 static int __init hv_acpi_init(void)
 {
        int ret, t;
 
-       if (!query_hypervisor_presence())
+       if (x86_hyper != &x86_hyper_ms_hyperv)
                return -ENODEV;
 
        init_completion(&probe_event);