summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-21 09:41:39 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-21 09:41:38 -0700
commitf9da89f3cad4a79df8e571f592d2f71e295a5c26 (patch)
treec8f2ecd40c3012f2f08db27029b10c23dba197ad
parent2fcd6d4d017c306c30c86c2eec97faa5010362e1 (diff)
parentce47b1c984d429704ddab5c8a3534f1b45679daf (diff)
Merge "lpm-levels: Select lpm for isolated cpu when sleep is disabled"
-rw-r--r--drivers/cpuidle/lpm-levels.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/lpm-levels.c b/drivers/cpuidle/lpm-levels.c
index 4ba8f12f4b19..4224b594f1b8 100644
--- a/drivers/cpuidle/lpm-levels.c
+++ b/drivers/cpuidle/lpm-levels.c
@@ -691,7 +691,7 @@ static int cpu_power_select(struct cpuidle_device *dev,
if (!cpu)
return -EINVAL;
- if (sleep_disabled)
+ if (sleep_disabled && !cpu_isolated(dev->cpu))
return 0;
idx_restrict = cpu->nlevels + 1;