diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-29 15:37:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:01:53 -0700 |
| commit | f931a70c370cc826191a51a79500b34cd592b25b (patch) | |
| tree | ffcc04a08a3d65dc47994d37752043b5fd634672 | |
| parent | 45da89e559219d24a639f24a8d95a6c71d54736f (diff) | |
Staging: hv: remove custom cpuid function
Use the one that the kernel provides, it does it correctly.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/Hv.c | 8 | ||||
| -rw-r--r-- | drivers/staging/hv/include/osd.h | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index 334812fdc84..4b9b3fb3b93 100644 --- a/drivers/staging/hv/Hv.c +++ b/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/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index 6eeb87ebdac..0444c18990d 100644 --- a/drivers/staging/hv/include/osd.h +++ b/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); |