2022-03-30 03:30:54

by Jeff Xie

[permalink] [raw]
Subject: [PATCH 2/3] tracing: make tracepoint_printk_key public

The syscall tracepoints need tracepoint_printk_key for the tp_printk work.

Signed-off-by: Jeff Xie <[email protected]>
---
kernel/trace/trace.c | 2 +-
kernel/trace/trace.h | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 867f00473f9f..8efee5d339b9 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -88,7 +88,7 @@ void __init disable_tracing_selftest(const char *reason)
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);
+DEFINE_STATIC_KEY_FALSE(tracepoint_printk_key);

/* For tracers that don't implement custom flags */
static struct tracer_opt dummy_tracer_opt[] = {
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 7ce345699ac2..f44a9510209c 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1524,6 +1524,7 @@ static inline void *event_file_data(struct file *filp)
extern struct mutex event_mutex;
extern struct list_head ftrace_events;
extern spinlock_t tracepoint_iter_lock;
+DECLARE_STATIC_KEY_FALSE(tracepoint_printk_key);

extern const struct file_operations event_trigger_fops;
extern const struct file_operations event_hist_fops;
--
2.25.1