Skip to content

Commit 6cb1360

Browse files
committed
tools/power/turbostat: Rename rapl probing function
Rename rapl_probe() to probe_rapl() to be consistent with other probing function names. Probe rapl after probing uncore frequency. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Reviewed-by: Len Brown <len.brown@intel.com>
1 parent 622c8f2 commit 6cb1360

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

tools/power/x86/turbostat/turbostat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4865,11 +4865,11 @@ void rapl_probe_amd(void)
48654865
}
48664866

48674867
/*
4868-
* rapl_probe()
4868+
* probe_rapl()
48694869
*
48704870
* sets rapl_power_units, rapl_energy_units, rapl_time_units
48714871
*/
4872-
void rapl_probe(void)
4872+
void probe_rapl(void)
48734873
{
48744874
if (!platform->rapl_msrs)
48754875
return;
@@ -5558,11 +5558,11 @@ void process_cpuid()
55585558

55595559
probe_intel_uncore_frequency();
55605560

5561+
probe_rapl();
5562+
55615563
if (platform->has_nhm_msrs)
55625564
BIC_PRESENT(BIC_SMI);
55635565

5564-
rapl_probe();
5565-
55665566
if (!access("/sys/class/drm/card0/power/rc6_residency_ms", R_OK))
55675567
BIC_PRESENT(BIC_GFX_rc6);
55685568

0 commit comments

Comments
 (0)