summaryrefslogtreecommitdiff
path: root/kernel
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:03:57 -0700
commita8fd51944ec90a41b37afe0aee25cf9ec17be8fe (patch)
treeb68588a786beda6083cf197149e7dc69ffee8d60 /kernel
parent76f01555c78e496203105bd29b878db3431a2260 (diff)
downloadlinux-3.10-a8fd51944ec90a41b37afe0aee25cf9ec17be8fe.tar.gz
linux-3.10-a8fd51944ec90a41b37afe0aee25cf9ec17be8fe.tar.bz2
linux-3.10-a8fd51944ec90a41b37afe0aee25cf9ec17be8fe.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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/smp.c b/kernel/smp.c
index 4dba0f7b72a..88797cb0d23 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -658,7 +658,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();
}