Skip to content

Commit

Permalink
tools/power turbostat: call __cpuid() instead of __get_cpuid()
Browse files Browse the repository at this point in the history
turbostat already checks whether calling each cpuid leavf is legal,
and it doesn't look at the function return value,
so call the simpler gcc intrinsic __cpuid() instead of __get_cpuid().

syntax only, no functional change

Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Len Brown committed Mar 13, 2016
1 parent aa8d8cc commit 5aea2f7
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions tools/power/x86/turbostat/turbostat.c
Original file line number Diff line number Diff line change
Expand Up @@ -3103,7 +3103,7 @@ void process_cpuid()

eax = ebx = ecx = edx = 0;

__get_cpuid(0, &max_level, &ebx, &ecx, &edx);
__cpuid(0, max_level, ebx, ecx, edx);

if (ebx == 0x756e6547 && edx == 0x49656e69 && ecx == 0x6c65746e)
genuine_intel = 1;
Expand All @@ -3112,7 +3112,7 @@ void process_cpuid()
fprintf(outf, "CPUID(0): %.4s%.4s%.4s ",
(char *)&ebx, (char *)&edx, (char *)&ecx);

__get_cpuid(1, &fms, &ebx, &ecx, &edx);
__cpuid(1, fms, ebx, ecx, edx);
family = (fms >> 8) & 0xf;
model = (fms >> 4) & 0xf;
stepping = fms & 0xf;
Expand Down Expand Up @@ -3143,15 +3143,15 @@ void process_cpuid()
* This check is valid for both Intel and AMD.
*/
ebx = ecx = edx = 0;
__get_cpuid(0x80000000, &max_extended_level, &ebx, &ecx, &edx);
__cpuid(0x80000000, max_extended_level, ebx, ecx, edx);

if (max_extended_level >= 0x80000007) {

/*
* Non-Stop TSC is advertised by CPUID.EAX=0x80000007: EDX.bit8
* this check is valid for both Intel and AMD
*/
__get_cpuid(0x80000007, &eax, &ebx, &ecx, &edx);
__cpuid(0x80000007, eax, ebx, ecx, edx);
has_invariant_tsc = edx & (1 << 8);
}

Expand All @@ -3160,7 +3160,7 @@ void process_cpuid()
* this check is valid for both Intel and AMD
*/

__get_cpuid(0x6, &eax, &ebx, &ecx, &edx);
__cpuid(0x6, eax, ebx, ecx, edx);
has_aperf = ecx & (1 << 0);
do_dts = eax & (1 << 0);
do_ptm = eax & (1 << 6);
Expand Down Expand Up @@ -3209,7 +3209,7 @@ void process_cpuid()
* CPUID 15H TSC/Crystal ratio, possibly Crystal Hz
*/
eax_crystal = ebx_tsc = crystal_hz = edx = 0;
__get_cpuid(0x15, &eax_crystal, &ebx_tsc, &crystal_hz, &edx);
__cpuid(0x15, eax_crystal, ebx_tsc, crystal_hz, edx);

if (ebx_tsc != 0) {

Expand Down Expand Up @@ -3243,7 +3243,7 @@ void process_cpuid()
*/
base_mhz = max_mhz = bus_mhz = edx = 0;

__get_cpuid(0x16, &base_mhz, &max_mhz, &bus_mhz, &edx);
__cpuid(0x16, base_mhz, max_mhz, bus_mhz, edx);
if (debug)
fprintf(outf, "CPUID(0x16): base_mhz: %d max_mhz: %d bus_mhz: %d\n",
base_mhz, max_mhz, bus_mhz);
Expand Down

0 comments on commit 5aea2f7

Please sign in to comment.