projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'
[cascardo/linux.git]
/
drivers
/
cpufreq
/
intel_pstate.c
diff --git
a/drivers/cpufreq/intel_pstate.c
b/drivers/cpufreq/intel_pstate.c
index
b5cafb7
..
be9eade
100644
(file)
--- 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;
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)
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;
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)
nont = core_get_max_pstate();
ret = (((value) >> 8) & 0xFF);
if (ret <= nont)