Re: [PATCH 2/2] tracing: drop handling of NOTRACE symbol

[Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>]

Hello Linus and Steven,

On Mon, Apr 08, 2019 at 04:29:15PM +0200, Linus Walleij wrote:
> On Mon, Apr 8, 2019 at 4:27 PM Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:
> 
> > On Mon, 8 Apr 2019 15:42:55 +0200
> > Linus Walleij <linus.walleij@xxxxxxxxxx> wrote:
> >
> > > > That's fine for me, but I'm a bit surprised you did that without an ack
> > > > from the tracing people?
> > >
> > > oOOPS no I guess I shouldn't, haha I just didn't
> > > look close enough, I thought for some reason it only
> > > applied in the GPIO subsystem. I'll back this out.
> >
> > No need to back it out.
> >
> > Acked-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
> 
> OK applied to the GPIO tree.

I just found this patch in one of my older topic branches and it still
applies to current Linus (Torvald)'s master.

Given that the only user is gone since 5.2-rc1 (commit
12f2639038ef420fe796171ffb810b30d1ac0619)

For reference, here comes it again, slightly adapted to reality. (Use
git am --scissors to apply.)

Best regards
Uwe

---->8----
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@xxxxxxxxxxxxxx>
Date: Fri, 5 Apr 2019 21:31:47 +0200
Subject: [PATCH] tracing: drop handling of NOTRACE symbol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a header defined the NOTRACE cpp symbol creation of tracepoints was
skipped. Since this feature was introduced in 4.4-rc1 it was only ever
used by the gpio events and this was dropped in v5.2-rc1. So
remove this now unused knob, also to not encourage a new usage.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
---
 include/linux/tracepoint.h | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 1fb11daa5c53..7d03805503bd 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -136,18 +136,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
 #define TP_ARGS(args...)	args
 #define TP_CONDITION(args...)	args
 
-/*
- * Individual subsystem my have a separate configuration to
- * enable their tracepoints. By default, this file will create
- * the tracepoints if CONFIG_TRACEPOINT is defined. If a subsystem
- * wants to be able to disable its tracepoints from being created
- * it can define NOTRACE before including the tracepoint headers.
- */
-#if defined(CONFIG_TRACEPOINTS) && !defined(NOTRACE)
-#define TRACEPOINTS_ENABLED
-#endif
-
-#ifdef TRACEPOINTS_ENABLED
+#ifdef CONFIG_TRACEPOINTS
 
 /*
  * it_func[0] is never NULL because there is at least one element in the array
@@ -295,7 +284,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
 #define EXPORT_TRACEPOINT_SYMBOL(name)					\
 	EXPORT_SYMBOL(__tracepoint_##name)
 
-#else /* !TRACEPOINTS_ENABLED */
+#else /* !CONFIG_TRACEPOINTS */
 #define __DECLARE_TRACE(name, proto, args, cond, data_proto, data_args) \
 	static inline void trace_##name(proto)				\
 	{ }								\
@@ -327,7 +316,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
 #define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
 #define EXPORT_TRACEPOINT_SYMBOL(name)
 
-#endif /* TRACEPOINTS_ENABLED */
+#endif /* CONFIG_TRACEPOINTS */
 
 #ifdef CONFIG_TRACING
 /**
-- 
2.20.1


-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |