From nobody Sun Feb 8 15:01:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE09CB652 for ; Tue, 26 Nov 2024 13:35:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732628128; cv=none; b=uxyt6p6vi7bzsVVTA1/VBDGYQLAKUnAKrcvRV78Z6+1YA5Zozp0eiw0sszRuADnM8wJaXUaJa/0NGhfGNHy/loQHC41fdtr15lE00zM/OE+CRXQJmRwhXpBhUxU4qmaWA7P02QuEfwWswhMmjB6cS9K2cgFrWmYgZBgxV2Hur9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732628128; c=relaxed/simple; bh=mD6T0KzAr+GxJs1Ts0FAm9TI0qxcxb+omjemism4Zzw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=R+zX/gLRSIXRIa/c9Q0P0t75NaR+2UgzCM1uGbGXXLsnQroJXF3TDgOEObYwLORMYCH77f1l4jc7cYjpjy6hbFGjJDaR3LmJX6moIL33pFQAW6BIy8jCVlYJF3zVc74ep0u0JraelPwmu3HgHb7JdysKeSuOFZrSarURLKE5lss= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id E411DC4CECF; Tue, 26 Nov 2024 13:35:24 +0000 (UTC) Date: Tue, 26 Nov 2024 08:36:14 -0500 From: Steven Rostedt To: LKML Cc: Masami Hiramatsu , Mathieu Desnoyers Subject: [for-next][PATCH] tracing: Use guard() rather than scoped_guard() Message-ID: <20241126083614.29ae8296@gandalf.local.home> X-Mailer: Claws Mail 3.20.0git84 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace/for-next Head SHA1: 2bd9b57d04df417f31ef54448477c212fcdd14fc Mathieu Desnoyers (1): tracing: Use guard() rather than scoped_guard() ---- include/linux/tracepoint.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --------------------------- commit 2bd9b57d04df417f31ef54448477c212fcdd14fc Author: Mathieu Desnoyers Date: Mon Nov 25 09:25:14 2024 -0500 tracing: Use guard() rather than scoped_guard() =20 Using scoped_guard() in the implementation of trace_##name() adds an unnecessary level of indentation. =20 Cc: Steven Rostedt Cc: Linus Torvalds Cc: Thomas Gleixner Cc: Michael Jeanson Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: Alexei Starovoitov Cc: Yonghong Song Cc: Paul E. McKenney Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Mark Rutland Cc: Alexander Shishkin Cc: Namhyung Kim Cc: Andrii Nakryiko Cc: bpf@vger.kernel.org Cc: Joel Fernandes Cc: Jordan Rife Link: https://lore.kernel.org/20241125142514.2897143-1-mathieu.desnoyer= s@efficios.com Signed-off-by: Mathieu Desnoyers Signed-off-by: Steven Rostedt (Google) diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index b2633a72e871..e398f6e43f61 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -259,8 +259,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(t= racepoint_ptr_t *p) { \ if (static_branch_unlikely(&__tracepoint_##name.key)) { \ if (cond) { \ - scoped_guard(preempt_notrace) \ - __DO_TRACE_CALL(name, TP_ARGS(args)); \ + guard(preempt_notrace)(); \ + __DO_TRACE_CALL(name, TP_ARGS(args)); \ } \ } \ if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) { \ @@ -275,8 +275,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(t= racepoint_ptr_t *p) { \ might_fault(); \ if (static_branch_unlikely(&__tracepoint_##name.key)) { \ - scoped_guard(rcu_tasks_trace) \ - __DO_TRACE_CALL(name, TP_ARGS(args)); \ + guard(rcu_tasks_trace)(); \ + __DO_TRACE_CALL(name, TP_ARGS(args)); \ } \ if (IS_ENABLED(CONFIG_LOCKDEP)) { \ WARN_ONCE(!rcu_is_watching(), \