2022-11-22 09:38:56

by Xiu Jianfeng

Subject: [PATCH --next] tracing: Make tracepoint_print_iter static

After change in commit 4239174570da ("tracing: Make tracepoint_printk a
static_key"), this symbol is not used outside of the file, so mark it
static.

Signed-off-by: Xiu Jianfeng <[email protected]>
---
kernel/trace/trace.c | 2 +-
kernel/trace/trace.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 47a44b055a1d..11a7214a2f49 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -85,7 +85,7 @@ void __init disable_tracing_selftest(const char *reason)
#endif

/* Pipe tracepoints to printk */
-struct trace_iterator *tracepoint_print_iter;
+static struct trace_iterator *tracepoint_print_iter;
int tracepoint_printk;
static bool tracepoint_printk_stop_on_boot __initdata;
static DEFINE_STATIC_KEY_FALSE(tracepoint_printk_key);
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 54ee5711c729..d9b470a0adf2 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1941,8 +1941,6 @@ static inline void tracer_hardirqs_on(unsigned long a0, unsigned long a1) { }
static inline void tracer_hardirqs_off(unsigned long a0, unsigned long a1) { }
#endif

-extern struct trace_iterator *tracepoint_print_iter;
-
/*
* Reset the state of the trace_iterator so that it can read consumed data.
* Normally, the trace_iterator is used for reading the data when it is not
--
2.17.1

2022-11-22 09:41:00

by Xiu Jianfeng

Subject: Re: [PATCH --next] tracing: Make tracepoint_print_iter static

sorry, ignore this.

?? 2022/11/22 17:10, Xiu Jianfeng д??:
> After change in commit 4239174570da ("tracing: Make tracepoint_printk a
> static_key"), this symbol is not used outside of the file, so mark it
> static.
>
> Signed-off-by: Xiu Jianfeng <[email protected]>
> ---
> kernel/trace/trace.c | 2 +-
> kernel/trace/trace.h | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 47a44b055a1d..11a7214a2f49 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -85,7 +85,7 @@ void __init disable_tracing_selftest(const char *reason)
> #endif
>
> /* Pipe tracepoints to printk */
> -struct trace_iterator *tracepoint_print_iter;
> +static struct trace_iterator *tracepoint_print_iter;
> int tracepoint_printk;
> static bool tracepoint_printk_stop_on_boot __initdata;
> static DEFINE_STATIC_KEY_FALSE(tracepoint_printk_key);
> diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
> index 54ee5711c729..d9b470a0adf2 100644
> --- a/kernel/trace/trace.h
> +++ b/kernel/trace/trace.h
> @@ -1941,8 +1941,6 @@ static inline void tracer_hardirqs_on(unsigned long a0, unsigned long a1) { }
> static inline void tracer_hardirqs_off(unsigned long a0, unsigned long a1) { }
> #endif
>
> -extern struct trace_iterator *tracepoint_print_iter;
> -
> /*
> * Reset the state of the trace_iterator so that it can read consumed data.
> * Normally, the trace_iterator is used for reading the data when it is not
>