projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
cpufreq
/
intel_pstate.c
diff --git
a/drivers/cpufreq/intel_pstate.c
b/drivers/cpufreq/intel_pstate.c
index 27faee5f0e237990de3c532b1227b9b3ad01b603..3af9dd7332e6927d8dd860b5af410fba738bff4a 100644
(file)
--- a/
drivers/cpufreq/intel_pstate.c
+++ b/
drivers/cpufreq/intel_pstate.c
@@
-776,7
+776,7
@@
static inline void intel_pstate_sample(struct cpudata *cpu)
local_irq_save(flags);
rdmsrl(MSR_IA32_APERF, aperf);
rdmsrl(MSR_IA32_MPERF, mperf);
- tsc =
native_read_
tsc();
+ tsc =
rd
tsc();
local_irq_restore(flags);
cpu->last_sample_time = cpu->sample.time;