1 files changed, 9 insertions, 8 deletions

diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index acfdbf353a0b..be586c632a0c 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -134,9 +134,6 @@ extern void syscall_unregfunc(void);
                 void *it_func;                                          \
                 void *__data;                                           \
                                                                         \
-                if (!cpu_online(raw_smp_processor_id()))                \
-                        return;                                         \
-                                                                        \
                 if (!(cond))                                            \
                         return;                                         \
                 prercu;                                                 \
@@ -343,15 +340,19 @@ extern void syscall_unregfunc(void);
  * "void *__data, proto" as the callback prototype.
  */
 #define DECLARE_TRACE_NOARGS(name)                                      \
-                __DECLARE_TRACE(name, void, , 1, void *__data, __data)
+        __DECLARE_TRACE(name, void, ,                                   \
+                        cpu_online(raw_smp_processor_id()),             \
+                        void *__data, __data)
 
 #define DECLARE_TRACE(name, proto, args)                                \
-                __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), 1,   \
-                                PARAMS(void *__data, proto),            \
-                                PARAMS(__data, args))
+        __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),              \
+                        cpu_online(raw_smp_processor_id()),             \
+                        PARAMS(void *__data, proto),                    \
+                        PARAMS(__data, args))
 
 #define DECLARE_TRACE_CONDITION(name, proto, args, cond)                \
-        __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), PARAMS(cond), \
+        __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),              \
+                        cpu_online(raw_smp_processor_id()) && (PARAMS(cond)), \
                         PARAMS(void *__data, proto),                    \
                         PARAMS(__data, args))