From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Aug 2017 21:21:18 +0000 (-0700)
Subject: Merge tag 'pm-4.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d33a2a914319e9ec71f49bad2b8c8b9e05a58edf;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'pm-4.13-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "These fix two issues related to exposing the current CPU frequency to
  user space on x86.

  Specifics:

   - Disable interrupts around reading IA32_APERF and IA32_MPERF in
     aperfmperf_snapshot_khz() (introduced recently) to avoid excessive
     delays between the reads that may result from interrupt handling
     (Doug Smythies).

   - Fix the computation of the CPU frequency to be reported through the
     pstate_sample tracepoint in intel_pstate (Doug Smythies)"

* tag 'pm-4.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: x86: Disable interrupts during MSRs reading
  cpufreq: intel_pstate: report correct CPU frequencies during trace
---

d33a2a914319e9ec71f49bad2b8c8b9e05a58edf