summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-27 04:28:26 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-27 04:28:25 -0700
commitfbb8507e773545af6f3ded6198da63e06e88a328 (patch)
tree215e13999c943de839832767c242f855531e78cf
parent89279350de5d0c67146a94243aaf872acf80cc6b (diff)
parent601aa0863493322ab167017bb66b0447ab57df4c (diff)
Merge "lpm-levels: Remove IPI check on hot plugged cores"
-rw-r--r--drivers/cpuidle/lpm-levels.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/cpuidle/lpm-levels.c b/drivers/cpuidle/lpm-levels.c
index b69e59eeeae1..7cd1bbbe1ee8 100644
--- a/drivers/cpuidle/lpm-levels.c
+++ b/drivers/cpuidle/lpm-levels.c
@@ -1119,10 +1119,14 @@ static int cluster_configure(struct lpm_cluster *cluster, int idx,
bool from_idle, int predicted)
{
struct lpm_cluster_level *level = &cluster->levels[idx];
+ struct cpumask online_cpus;
int ret, i;
+ cpumask_and(&online_cpus, &cluster->num_children_in_sync,
+ cpu_online_mask);
+
if (!cpumask_equal(&cluster->num_children_in_sync, &cluster->child_cpus)
- || is_IPI_pending(&cluster->num_children_in_sync)) {
+ || is_IPI_pending(&online_cpus)) {
return -EPERM;
}