diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:46:30 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:46:30 +0200 |
commit | bc841e260c95608921809a2c7481cf6f03bec21a (patch) | |
tree | 2c2863c2b4024ac8c9de72eaa9e032f417d5d4d1 /tools/power/x86/turbostat/turbostat.c | |
parent | Merge branch 'powercap' (diff) | |
parent | x86: remove duplicate turbo ratio limit MSRs (diff) | |
download | linux-dev-bc841e260c95608921809a2c7481cf6f03bec21a.tar.xz linux-dev-bc841e260c95608921809a2c7481cf6f03bec21a.zip |
Merge branch 'pm-cpu'
* pm-cpu:
x86: remove duplicate turbo ratio limit MSRs
tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT
cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT
Diffstat (limited to 'tools/power/x86/turbostat/turbostat.c')
-rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index acbf7ff2ee6e..3e199b508a96 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1480,7 +1480,7 @@ dump_knl_turbo_ratio_limits(void) unsigned int cores[buckets_no]; unsigned int ratio[buckets_no]; - get_msr(base_cpu, MSR_NHM_TURBO_RATIO_LIMIT, &msr); + get_msr(base_cpu, MSR_TURBO_RATIO_LIMIT, &msr); fprintf(outf, "cpu%d: MSR_TURBO_RATIO_LIMIT: 0x%08llx\n", base_cpu, msr); |