Skip to content

Commit

Permalink
Staging: hv: remove custom cpuid function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Sep 15, 2009
1 parent 45da89e commit f931a70
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/hv/Hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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),
Expand All @@ -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),
Expand All @@ -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,
Expand Down
6 changes: 0 additions & 6 deletions drivers/staging/hv/include/osd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f931a70

Please sign in to comment.