diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2016-06-01 18:52:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-10 07:41:43 -0800 |
| commit | 8a1d3de19b0afbf069baf704afecfbeba9059fce (patch) | |
| tree | 40028709ccfbc6328b361ea1bb26948bfebd4d91 /kernel | |
| parent | 74ede0af32f565ac5b7222c8722cc7da6951bef4 (diff) | |
| download | linux-stable-8a1d3de19b0afbf069baf704afecfbeba9059fce.tar.gz linux-stable-8a1d3de19b0afbf069baf704afecfbeba9059fce.tar.bz2 linux-stable-8a1d3de19b0afbf069baf704afecfbeba9059fce.zip | |
cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE
commit 9bd616e3dbedfc103f158197c8ad93678849b1ed upstream.
The cpuidle_devices per-CPU variable is only defined when CPU_IDLE is
enabled. Commit c8cc7d4de7a4 ("sched/idle: Reorganize the idle loop")
removed the #ifdef CONFIG_CPU_IDLE around cpuidle_idle_call() with the
compiler optimising away __this_cpu_read(cpuidle_devices). However, with
CONFIG_UBSAN && !CONFIG_CPU_IDLE, this optimisation no longer happens
and the kernel fails to link since cpuidle_devices is not defined.
This patch introduces an accessor function for the current CPU cpuidle
device (returning NULL when !CONFIG_CPU_IDLE) and uses it in
cpuidle_idle_call().
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: 4.5+ <stable@vger.kernel.org> # 4.5+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 4a2ef5a02fd3..bfd573122e0d 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -132,7 +132,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; |