On Wed, 08 Feb 2012 10:30:51 +0100
"Michal Nazarewicz" [off-list ref] wrote:

quoted

quoted

    } while (0)
+/*
+ * Preemption is disabled here to make sure the
+ * cond_func is called under the same condtions in UP
+ * and SMP.
+ */
+#define on_each_cpu_cond(cond_func, func, info, wait, gfp_flags) \
+   do {                                            \

How about:

              void *__info = (info);

as to avoid double execution.

Yup.  How does this look?


From: Andrew Morton <akpm@linux-foundation.org>
Subject: smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix

- avoid double-evaluation of `info' (per Michal)
- parenthesise evaluation of `cond_func'

Cc: "Srivatsa S. Bhat" <redacted>
Cc: Gilad Ben-Yossef <gilad@benyossef.com>
Cc: Michal Nazarewicz <redacted>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/smp.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/include/linux/smp.h~smp-add-func-to-ipi-cpus-based-on-parameter-func-update-fix
+++ a/include/linux/smp.h

@@ -168,10 +168,11 @@ static inline int up_smp_call_function(s

 */
 #define on_each_cpu_cond(cond_func, func, info, wait, gfp_flags)\
       do {                                                    \
+               void *__info = (info);                          \
               preempt_disable();                              \
-               if (cond_func(0, info)) {                       \
+               if ((cond_func)(0, __info)) {                   \
                       local_irq_disable();                    \
-                       (func)(info);                           \
+                       (func)(__info);                         \
                       local_irq_enable();                     \
               }                                               \
               preempt_enable();                               \
_