lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: remove custom cpuid function

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2009-07-29 15:37:12 -07:00
parent 45da89e559
commit f931a70c37
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/hv/Hv.c
View File

@@ -61,7 +61,7 @@ HvQueryHypervisorPresence (
ecx = 0; ecx = 0;
edx = 0; edx = 0;
op = HvCpuIdFunctionVersionAndFeatures; op = HvCpuIdFunctionVersionAndFeatures;
do_cpuid(op, &eax, &ebx, &ecx, &edx); cpuid(op, &eax, &ebx, &ecx, &edx);
return (ecx & HV_PRESENT_BIT); return (ecx & HV_PRESENT_BIT);
} }
@@ -99,7 +99,7 @@ HvQueryHypervisorInfo (
ecx = 0; ecx = 0;
edx = 0; edx = 0;
op = HvCpuIdFunctionHvVendorAndMaxFunction; 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", DPRINT_INFO(VMBUS, "Vendor ID: %c%c%c%c%c%c%c%c%c%c%c%c",
(ebx & 0xFF), (ebx & 0xFF),
@@ -121,7 +121,7 @@ HvQueryHypervisorInfo (
ecx = 0; ecx = 0;
edx = 0; edx = 0;
op = HvCpuIdFunctionHvInterface; op = HvCpuIdFunctionHvInterface;
do_cpuid(op, &eax, &ebx, &ecx, &edx); cpuid(op, &eax, &ebx, &ecx, &edx);
DPRINT_INFO(VMBUS, "Interface ID: %c%c%c%c", DPRINT_INFO(VMBUS, "Interface ID: %c%c%c%c",
(eax & 0xFF), (eax & 0xFF),
@@ -135,7 +135,7 @@ HvQueryHypervisorInfo (
ecx = 0; ecx = 0;
edx = 0; edx = 0;
op = HvCpuIdFunctionMsHvVersion; 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", DPRINT_INFO(VMBUS, "OS Build:%d-%d.%d-%d-%d.%d",
eax, eax,
ebx >> 16, ebx >> 16,

6
drivers/staging/hv/include/osd.h
View File

@@ -101,12 +101,6 @@ struct osd_timer {
#endif #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 */ /* Osd routines */
extern void* VirtualAllocExec(unsigned int size); extern void* VirtualAllocExec(unsigned int size);