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 /drivers/cpufreq | |
| parent | Merge branch 'powercap' (diff) | |
| parent | x86: remove duplicate turbo ratio limit MSRs (diff) | |
| download | linux-bc841e260c95608921809a2c7481cf6f03bec21a.tar.xz linux-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 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index d8028def199d..9ec033b4f2d9 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -972,7 +972,7 @@ static int core_get_turbo_pstate(void) u64 value; int nont, ret; - rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value); + rdmsrl(MSR_TURBO_RATIO_LIMIT, value); nont = core_get_max_pstate(); ret = (value) & 255; if (ret <= nont) @@ -1001,7 +1001,7 @@ static int knl_get_turbo_pstate(void) u64 value; int nont, ret; - rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value); + rdmsrl(MSR_TURBO_RATIO_LIMIT, value); nont = core_get_max_pstate(); ret = (((value) >> 8) & 0xFF); if (ret <= nont) |