Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux.git] / kernel / smp.c

diff --git a/kernel/smp.c b/kernel/smp.c
index 3b7bedc97af38d004f74439b4e587d9666e42580..d0ada39eb4d41bb4a246d28bec3f7ed4ba9d8c2a 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -435,7 +435,7 @@ static void smp_call_function_many_cond(const struct cpumask *mask,
 
        /* Fastpath: do that cpu by itself. */
        if (next_cpu >= nr_cpu_ids) {
-               if (!cond_func || (cond_func && cond_func(cpu, info)))
+               if (!cond_func || cond_func(cpu, info))
                        smp_call_function_single(cpu, func, info, wait);
                return;
        }