From 5c3469cb899abe998299aafb8f16f325d62d2d68 Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu Date: Wed, 29 Jan 2020 18:36:44 +0900 Subject: [PATCH] tracing/boot: Move external function declarations to kernel/trace/trace.h Move external function declarations into kernel/trace/trace.h from trace_boot.c for tracing subsystem internal use. Link: http://lkml.kernel.org/r/158029060405.12381.11944554430359702545.stgit@devnote2 Signed-off-by: Masami Hiramatsu Signed-off-by: Steven Rostedt (VMware) --- kernel/trace/trace.h | 17 +++++++++++++++++ kernel/trace/trace_boot.c | 15 --------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 6bb64d89c321..b3075b637d14 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1157,6 +1157,11 @@ int unregister_ftrace_command(struct ftrace_func_command *cmd); void ftrace_create_filter_files(struct ftrace_ops *ops, struct dentry *parent); void ftrace_destroy_filter_files(struct ftrace_ops *ops); + +extern int ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf, + int len, int reset); +extern int ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf, + int len, int reset); #else struct ftrace_func_command; @@ -1905,6 +1910,15 @@ void trace_printk_start_comm(void); int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set); int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled); +/* Used from boot time tracer */ +extern int trace_set_options(struct trace_array *tr, char *option); +extern int tracing_set_tracer(struct trace_array *tr, const char *buf); +extern ssize_t tracing_resize_ring_buffer(struct trace_array *tr, + unsigned long size, int cpu_id); +extern int tracing_set_cpumask(struct trace_array *tr, + cpumask_var_t tracing_cpumask_new); + + #define MAX_EVENT_NAME_LEN 64 extern int trace_run_command(const char *buf, int (*createfn)(int, char**)); @@ -1964,6 +1978,9 @@ static inline const char *get_syscall_name(int syscall) #ifdef CONFIG_EVENT_TRACING void trace_event_init(void); void trace_event_eval_update(struct trace_eval_map **map, int len); +/* Used from boot time tracer */ +extern int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set); +extern int trigger_process_regex(struct trace_event_file *file, char *buff); #else static inline void __init trace_event_init(void) { } static inline void trace_event_eval_update(struct trace_eval_map **map, int len) { } diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c index 5aad41961f03..4d37bf5c3742 100644 --- a/kernel/trace/trace_boot.c +++ b/kernel/trace/trace_boot.c @@ -21,13 +21,6 @@ #define MAX_BUF_LEN 256 -extern int trace_set_options(struct trace_array *tr, char *option); -extern int tracing_set_tracer(struct trace_array *tr, const char *buf); -extern ssize_t tracing_resize_ring_buffer(struct trace_array *tr, - unsigned long size, int cpu_id); -extern int tracing_set_cpumask(struct trace_array *tr, - cpumask_var_t tracing_cpumask_new); - static void __init trace_boot_set_instance_options(struct trace_array *tr, struct xbc_node *node) { @@ -76,9 +69,6 @@ trace_boot_set_instance_options(struct trace_array *tr, struct xbc_node *node) } #ifdef CONFIG_EVENT_TRACING -extern int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set); -extern int trigger_process_regex(struct trace_event_file *file, char *buff); - static void __init trace_boot_enable_events(struct trace_array *tr, struct xbc_node *node) { @@ -252,11 +242,6 @@ trace_boot_init_events(struct trace_array *tr, struct xbc_node *node) #endif #ifdef CONFIG_DYNAMIC_FTRACE -extern bool ftrace_filter_param __initdata; -extern int ftrace_set_filter(struct ftrace_ops *ops, unsigned char *buf, - int len, int reset); -extern int ftrace_set_notrace(struct ftrace_ops *ops, unsigned char *buf, - int len, int reset); static void __init trace_boot_set_ftrace_filter(struct trace_array *tr, struct xbc_node *node) { -- 2.30.2