path: root/kernel
diff options
authorLinus Torvalds <>2016-06-10 08:09:12 -0700
committerLinus Torvalds <>2016-06-10 08:09:12 -0700
commit524a3f2ca284831262fcf5e4ca145ef32f4b282d (patch)
tree0a956eec8e785f4e310686126898014fbcffe2c6 /kernel
parent9557c3cfdaa792c7db04b86f47b5dd1e6dc5ec4f (diff)
parent3681196ae568f97d534537c1c1102f4707ca11f9 (diff)
Merge tag 'pm-4.7-rc3' of git://
Pull power management fixes from Rafael Wysocki: "Stable-candidate fixes for the intel_pstate driver and the cpuidle core. Specifics: - Fix two intel_pstate initialization issues, one of which was introduced during the 4.4 cycle (Srinivas Pandruvada) - Fix kernel build with CONFIG_UBSAN set and CONFIG_CPU_IDLE unset (Catalin Marinas)" * tag 'pm-4.7-rc3' of git:// cpufreq: intel_pstate: Fix ->set_policy() interface for no_turbo cpufreq: intel_pstate: Fix code ordering in intel_pstate_set_policy() cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE
Diffstat (limited to 'kernel')
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index bd12c6c714ec..c5aeedf4e93a 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -127,7 +127,7 @@ static int call_cpuidle(struct cpuidle_driver *drv, struct cpuidle_device *dev,
static void cpuidle_idle_call(void)
- struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
+ struct cpuidle_device *dev = cpuidle_get_device();
struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
int next_state, entered_state;