From 1c331909d8dd58c711140cc7973097467c5d2181 Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Fri, 17 Aug 2012 18:52:43 +0800
Subject: [PATCH] --- yaml --- r: 324393 b: refs/heads/master c:
 0592969e73ae50ce6852d1aff3d222a335289094 h: refs/heads/master i:   324391:
 aac0c226a78243c2c382f7c595273b1766170cb6 v: v3

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

diff --git a/[refs] b/[refs]
index 829147c9247d..1ea3e1cce48c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a52c4af48a2a35282ddc4dcf2df83486d636754
+refs/heads/master: 0592969e73ae50ce6852d1aff3d222a335289094
diff --git a/trunk/drivers/hv/hv.c b/trunk/drivers/hv/hv.c
index 771e24f2981d..3648f8f0f368 100644
--- a/trunk/drivers/hv/hv.c
+++ b/trunk/drivers/hv/hv.c
@@ -38,28 +38,6 @@ struct hv_context hv_context = {
 	.signal_event_buffer	= NULL,
 };
 
-/*
- * 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;
-}
-
 /*
  * query_hypervisor_info - Get version info of the windows hypervisor
  */
@@ -160,9 +138,6 @@ int hv_init(void)
 	memset(hv_context.synic_message_page, 0,
 	       sizeof(void *) * NR_CPUS);
 
-	if (!query_hypervisor_presence())
-		goto cleanup;
-
 	max_leaf = query_hypervisor_info();
 
 	/*
diff --git a/trunk/drivers/hv/vmbus_drv.c b/trunk/drivers/hv/vmbus_drv.c
index b76e8b321266..f40dd57bbec1 100644
--- a/trunk/drivers/hv/vmbus_drv.c
+++ b/trunk/drivers/hv/vmbus_drv.c
@@ -719,10 +719,35 @@ 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())
+		return -ENODEV;
+
 	init_completion(&probe_event);
 
 	/*