From fad8e59a91d503fe4e7a2ded4f180b077e4ffcc3 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 29 Jul 2009 15:37:12 -0700
Subject: [PATCH] --- yaml --- r: 162182 b: refs/heads/master c:
 f931a70c370cc826191a51a79500b34cd592b25b h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/hv/Hv.c          | 8 ++++----
 trunk/drivers/staging/hv/include/osd.h | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 4fb3d001a88c..82e85b71622c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45da89e559219d24a639f24a8d95a6c71d54736f
+refs/heads/master: f931a70c370cc826191a51a79500b34cd592b25b
diff --git a/trunk/drivers/staging/hv/Hv.c b/trunk/drivers/staging/hv/Hv.c
index 334812fdc84b..4b9b3fb3b933 100644
--- a/trunk/drivers/staging/hv/Hv.c
+++ b/trunk/drivers/staging/hv/Hv.c
@@ -61,7 +61,7 @@ HvQueryHypervisorPresence (
     ecx = 0;
     edx = 0;
     op = HvCpuIdFunctionVersionAndFeatures;
-    do_cpuid(op, &eax, &ebx, &ecx, &edx);
+    cpuid(op, &eax, &ebx, &ecx, &edx);
 
 	return (ecx & HV_PRESENT_BIT);
 }
@@ -99,7 +99,7 @@ HvQueryHypervisorInfo (
     ecx = 0;
     edx = 0;
     op = HvCpuIdFunctionHvVendorAndMaxFunction;
-    do_cpuid(op, &eax, &ebx, &ecx, &edx);
+    cpuid(op, &eax, &ebx, &ecx, &edx);
 
     DPRINT_INFO(VMBUS, "Vendor ID: %c%c%c%c%c%c%c%c%c%c%c%c",
 	   (ebx & 0xFF),
@@ -121,7 +121,7 @@ HvQueryHypervisorInfo (
     ecx = 0;
     edx = 0;
     op = HvCpuIdFunctionHvInterface;
-    do_cpuid(op, &eax, &ebx, &ecx, &edx);
+    cpuid(op, &eax, &ebx, &ecx, &edx);
 
     DPRINT_INFO(VMBUS, "Interface ID: %c%c%c%c",
 	   (eax & 0xFF),
@@ -135,7 +135,7 @@ HvQueryHypervisorInfo (
 	ecx = 0;
 	edx = 0;
 	op = HvCpuIdFunctionMsHvVersion;
-	do_cpuid(op, &eax, &ebx, &ecx, &edx);
+	cpuid(op, &eax, &ebx, &ecx, &edx);
 	DPRINT_INFO(VMBUS, "OS Build:%d-%d.%d-%d-%d.%d",
 	       eax,
 	       ebx >> 16,
diff --git a/trunk/drivers/staging/hv/include/osd.h b/trunk/drivers/staging/hv/include/osd.h
index 6eeb87ebdac0..0444c18990d0 100644
--- a/trunk/drivers/staging/hv/include/osd.h
+++ b/trunk/drivers/staging/hv/include/osd.h
@@ -101,12 +101,6 @@ struct osd_timer {
 #endif
 
 
-static inline void do_cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
-{
-	__asm__ __volatile__("cpuid" : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx) : "0" (op), "c" (ecx));
-}
-
-
 /* Osd routines */
 
 extern void* VirtualAllocExec(unsigned int size);