---

yaml --- r: 348346 b: refs/heads/master c: 92638e2 h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · e11bd1c · e11bd1c
1 parent f01c307
commit e11bd1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);