From df33165e289837fe47ce0166ba5102587b2f1ed9 Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Fri, 31 Aug 2012 13:32:44 +0800
Subject: [PATCH] --- yaml --- r: 324396 b: refs/heads/master c:
 1f94ea8181a9305a5d5cf635a6a4e9ac8ee3d2c3 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/hv/vmbus_drv.c | 25 ++-----------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index b6ca6f3cfc6a..9fd7a168069d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82aceae4f0d42f03d9ad7d1e90389e731153898f
+refs/heads/master: 1f94ea8181a9305a5d5cf635a6a4e9ac8ee3d2c3
diff --git a/trunk/drivers/hv/vmbus_drv.c b/trunk/drivers/hv/vmbus_drv.c
index f40dd57bbec1..8e1a9ec53003 100644
--- a/trunk/drivers/hv/vmbus_drv.c
+++ b/trunk/drivers/hv/vmbus_drv.c
@@ -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);