Skip to content

Commit 2bd9b57

Browse files
compudjrostedt
authored andcommitted
tracing: Use guard() rather than scoped_guard()
Using scoped_guard() in the implementation of trace_##name() adds an unnecessary level of indentation. Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Michael Jeanson <mjeanson@efficios.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Yonghong Song <yhs@fb.com> Cc: Paul E. McKenney <paulmck@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com> Cc: bpf@vger.kernel.org Cc: Joel Fernandes <joel@joelfernandes.org> Cc: Jordan Rife <jrife@google.com> Link: https://lore.kernel.org/20241125142514.2897143-1-mathieu.desnoyers@efficios.com Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent ef0d418 commit 2bd9b57

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/linux/tracepoint.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
259259
{ \
260260
if (static_branch_unlikely(&__tracepoint_##name.key)) { \
261261
if (cond) { \
262-
scoped_guard(preempt_notrace) \
263-
__DO_TRACE_CALL(name, TP_ARGS(args)); \
262+
guard(preempt_notrace)(); \
263+
__DO_TRACE_CALL(name, TP_ARGS(args)); \
264264
} \
265265
} \
266266
if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) { \
@@ -275,8 +275,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
275275
{ \
276276
might_fault(); \
277277
if (static_branch_unlikely(&__tracepoint_##name.key)) { \
278-
scoped_guard(rcu_tasks_trace) \
279-
__DO_TRACE_CALL(name, TP_ARGS(args)); \
278+
guard(rcu_tasks_trace)(); \
279+
__DO_TRACE_CALL(name, TP_ARGS(args)); \
280280
} \
281281
if (IS_ENABLED(CONFIG_LOCKDEP)) { \
282282
WARN_ONCE(!rcu_is_watching(), \

0 commit comments

Comments
 (0)