@@ -220,7 +220,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
220
220
* site if it is not watching, as it will need to be active when the
221
221
* tracepoint is enabled.
222
222
*/
223
- #define __DECLARE_TRACE_COMMON (name , proto , args , cond , data_proto ) \
223
+ #define __DECLARE_TRACE_COMMON (name , proto , args , data_proto ) \
224
224
extern int __traceiter_##name(data_proto); \
225
225
DECLARE_STATIC_CALL(tp_func_##name, __traceiter_##name); \
226
226
extern struct tracepoint __tracepoint_##name; \
@@ -254,7 +254,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
254
254
}
255
255
256
256
#define __DECLARE_TRACE (name , proto , args , cond , data_proto ) \
257
- __DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), cond, PARAMS(data_proto)) \
257
+ __DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto)) \
258
258
static inline void trace_##name(proto) \
259
259
{ \
260
260
if (static_branch_unlikely(&__tracepoint_##name.key)) { \
@@ -269,18 +269,16 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
269
269
} \
270
270
}
271
271
272
- #define __DECLARE_TRACE_SYSCALL (name , proto , args , cond , data_proto ) \
273
- __DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), cond, PARAMS(data_proto)) \
272
+ #define __DECLARE_TRACE_SYSCALL (name , proto , args , data_proto ) \
273
+ __DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto)) \
274
274
static inline void trace_##name(proto) \
275
275
{ \
276
276
might_fault(); \
277
277
if (static_branch_unlikely(&__tracepoint_##name.key)) { \
278
- if (cond) { \
279
- scoped_guard(rcu_tasks_trace) \
280
- __DO_TRACE_CALL(name, TP_ARGS(args)); \
281
- } \
278
+ scoped_guard(rcu_tasks_trace) \
279
+ __DO_TRACE_CALL(name, TP_ARGS(args)); \
282
280
} \
283
- if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) { \
281
+ if (IS_ENABLED(CONFIG_LOCKDEP)) { \
284
282
WARN_ONCE(!rcu_is_watching(), \
285
283
"RCU not watching for tracepoint"); \
286
284
} \
@@ -363,7 +361,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
363
361
364
362
365
363
#else /* !TRACEPOINTS_ENABLED */
366
- #define __DECLARE_TRACE (name , proto , args , cond , data_proto ) \
364
+ #define __DECLARE_TRACE_COMMON (name , proto , args , data_proto ) \
367
365
static inline void trace_##name(proto) \
368
366
{ } \
369
367
static inline int \
@@ -387,7 +385,11 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
387
385
return false; \
388
386
}
389
387
390
- #define __DECLARE_TRACE_SYSCALL __DECLARE_TRACE
388
+ #define __DECLARE_TRACE (name , proto , args , cond , data_proto ) \
389
+ __DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto))
390
+
391
+ #define __DECLARE_TRACE_SYSCALL (name , proto , args , data_proto ) \
392
+ __DECLARE_TRACE_COMMON(name, PARAMS(proto), PARAMS(args), PARAMS(data_proto))
391
393
392
394
#define DEFINE_TRACE_FN (name , reg , unreg , proto , args )
393
395
#define DEFINE_TRACE_SYSCALL (name , reg , unreg , proto , args )
@@ -453,7 +455,6 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
453
455
454
456
#define DECLARE_TRACE_SYSCALL (name , proto , args ) \
455
457
__DECLARE_TRACE_SYSCALL(name, PARAMS(proto), PARAMS(args), \
456
- cpu_online(raw_smp_processor_id()), \
457
458
PARAMS(void *__data, proto))
458
459
459
460
#define TRACE_EVENT_FLAGS (event , flag )
0 commit comments