summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Levin <sasha.levin@oracle.com>2014-08-06 16:08:14 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-17 09:19:09 -0700
commit7ca5cd1e33333809622d07f34dccd39ceba10e4a (patch)
tree0a7af49f034bd86f91d459f8a5d5f57721a2a011
parent1ae2c97a0a284ca73754acd2b3be33fe4f2505b2 (diff)
downloadkernel-common-7ca5cd1e33333809622d07f34dccd39ceba10e4a.tar.gz
kernel-common-7ca5cd1e33333809622d07f34dccd39ceba10e4a.tar.bz2
kernel-common-7ca5cd1e33333809622d07f34dccd39ceba10e4a.zip
kernel/smp.c:on_each_cpu_cond(): fix warning in fallback path
commit 618fde872163e782183ce574c77f1123e2be8887 upstream. The rarely-executed memry-allocation-failed callback path generates a WARN_ON_ONCE() when smp_call_function_single() succeeds. Presumably it's supposed to warn on failures. Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Cc: Christoph Lameter <cl@gentwo.org> Cc: Gilad Ben-Yossef <gilad@benyossef.com> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Tejun Heo <htejun@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/smp.c b/kernel/smp.c
index ffee35bef179..ff87d4479558 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -617,7 +617,7 @@ void on_each_cpu_cond(bool (*cond_func)(int cpu, void *info),
if (cond_func(cpu, info)) {
ret = smp_call_function_single(cpu, func,
info, wait);
- WARN_ON_ONCE(!ret);
+ WARN_ON_ONCE(ret);
}
preempt_enable();
}