2 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 00b042c49ccd..48f5aab117ae 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -144,7 +144,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                        \
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index acd522a91539..acfdbf353a0b 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -14,8 +14,10 @@
  * See the file COPYING for more details.
  */
 
+#include <linux/smp.h>
 #include <linux/errno.h>
 #include <linux/types.h>
+#include <linux/cpumask.h>
 #include <linux/rcupdate.h>
 #include <linux/tracepoint-defs.h>
 
@@ -132,6 +134,9 @@ extern void syscall_unregfunc(void);
                 void *it_func;                                          \
                 void *__data;                                           \
                                                                         \
+                if (!cpu_online(raw_smp_processor_id()))                \
+                        return;                                         \
+                                                                        \
                 if (!(cond))                                            \
                         return;                                         \
                 prercu;                                                 \