Merge tag 'v3.10.98' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / compiler.h

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 2472740d7ab2201f58d68ce864448b3def30cdaf..6977192bdb5955243d9cdd8e94f2f759748429ab 100644 (file)
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -131,7 +131,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
  */
 #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
 #define __trace_if(cond) \
-       if (__builtin_constant_p((cond)) ? !!(cond) :                   \
+       if (__builtin_constant_p(!!(cond)) ? !!(cond) :                 \
        ({                                                              \
                int ______r;                                            \
                static struct ftrace_branch_data                        \