summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSivaram Nair <sivaramn@nvidia.com>2012-12-18 13:52:54 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-03 13:11:05 +0100
commit92638e2facc5330475c7d558acec77721c3214e4 (patch)
tree121ddcb3c7f9dd13330b5156d385b648c19f35c1
parent0e5537b30d3029d784226ab51c2b923d1155b553 (diff)
downloadop-kernel-dev-92638e2facc5330475c7d558acec77721c3214e4.zip
op-kernel-dev-92638e2facc5330475c7d558acec77721c3214e4.tar.gz
cpuidle / coupled: fix ready counter decrement
The ready_waiting_counts atomic variable is compared against the wrong online cpu count. The latter is computed incorrectly using logical-OR instead of bit-OR. This patch fixes that. Signed-off-by: Sivaram Nair <sivaramn@nvidia.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Colin Cross <ccross@android.com> Cc: <stable@vger.kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/cpuidle/coupled.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c
index 3265844..2a297f8 100644
--- a/drivers/cpuidle/coupled.c
+++ b/drivers/cpuidle/coupled.c
@@ -209,7 +209,7 @@ inline int cpuidle_coupled_set_not_ready(struct cpuidle_coupled *coupled)
int all;
int ret;
- all = coupled->online_count || (coupled->online_count << WAITING_BITS);
+ all = coupled->online_count | (coupled->online_count << WAITING_BITS);
ret = atomic_add_unless(&coupled->ready_waiting_counts,
-MAX_WAITING_CPUS, all);
OpenPOWER on IntegriCloud