Merge branches 'intel_pstate-fix' and 'cpufreq-x86-fix'

Browse source

* intel_pstate-fix:
  cpufreq: intel_pstate: report correct CPU frequencies during trace

* cpufreq-x86-fix:
  cpufreq: x86: Disable interrupts during MSRs reading

...

This commit is contained in:

Rafael J. Wysocki 2017-08-17 21:00:30 +02:00

parent ef954844c7 c587c79f90 8e2f3bce05

commit 8179962b84

2 changed files with 4 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/x86/kernel/cpu/aperfmperf.c

View file

3

drivers/cpufreq/intel_pstate.c

View file