From e11bd1c35a37ac8f2216f2ad53e38f8ed50f4d0c Mon Sep 17 00:00:00 2001 From: Sivaram Nair Date: Tue, 18 Dec 2012 13:52:54 +0100 Subject: [PATCH] --- yaml --- r: 348346 b: refs/heads/master c: 92638e2facc5330475c7d558acec77721c3214e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/cpuidle/coupled.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8e6370619dc7..9378c1caab09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e5537b30d3029d784226ab51c2b923d1155b553 +refs/heads/master: 92638e2facc5330475c7d558acec77721c3214e4 diff --git a/trunk/drivers/cpuidle/coupled.c b/trunk/drivers/cpuidle/coupled.c index 3265844839bf..2a297f86dbad 100644 --- a/trunk/drivers/cpuidle/coupled.c +++ b/trunk/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);