Commit 38de93ab authored by Tom Zanussi's avatar Tom Zanussi Committed by Steven Rostedt
Browse files

tracing: Make register/unregister_ftrace_command __init

register/unregister_ftrace_command() are only ever called from __init
functions, so can themselves be made __init.

Also make register_snapshot_cmd() __init for the same reason.

Link: http://lkml.kernel.org/r/d4042c8cadb7ae6f843ac9a89a24e1c6a3099727.1382620672.git.tom.zanussi@linux.intel.com

Signed-off-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent f306cc82
...@@ -533,11 +533,11 @@ static inline int ftrace_force_update(void) { return 0; } ...@@ -533,11 +533,11 @@ static inline int ftrace_force_update(void) { return 0; }
static inline void ftrace_disable_daemon(void) { } static inline void ftrace_disable_daemon(void) { }
static inline void ftrace_enable_daemon(void) { } static inline void ftrace_enable_daemon(void) { }
static inline void ftrace_release_mod(struct module *mod) {} static inline void ftrace_release_mod(struct module *mod) {}
static inline int register_ftrace_command(struct ftrace_func_command *cmd) static inline __init int register_ftrace_command(struct ftrace_func_command *cmd)
{ {
return -EINVAL; return -EINVAL;
} }
static inline int unregister_ftrace_command(char *cmd_name) static inline __init int unregister_ftrace_command(char *cmd_name)
{ {
return -EINVAL; return -EINVAL;
} }
......
...@@ -3307,7 +3307,11 @@ void unregister_ftrace_function_probe_all(char *glob) ...@@ -3307,7 +3307,11 @@ void unregister_ftrace_function_probe_all(char *glob)
static LIST_HEAD(ftrace_commands); static LIST_HEAD(ftrace_commands);
static DEFINE_MUTEX(ftrace_cmd_mutex); static DEFINE_MUTEX(ftrace_cmd_mutex);
int register_ftrace_command(struct ftrace_func_command *cmd) /*
* Currently we only register ftrace commands from __init, so mark this
* __init too.
*/
__init int register_ftrace_command(struct ftrace_func_command *cmd)
{ {
struct ftrace_func_command *p; struct ftrace_func_command *p;
int ret = 0; int ret = 0;
...@@ -3326,7 +3330,11 @@ int register_ftrace_command(struct ftrace_func_command *cmd) ...@@ -3326,7 +3330,11 @@ int register_ftrace_command(struct ftrace_func_command *cmd)
return ret; return ret;
} }
int unregister_ftrace_command(struct ftrace_func_command *cmd) /*
* Currently we only unregister ftrace commands from __init, so mark
* this __init too.
*/
__init int unregister_ftrace_command(struct ftrace_func_command *cmd)
{ {
struct ftrace_func_command *p, *n; struct ftrace_func_command *p, *n;
int ret = -ENODEV; int ret = -ENODEV;
......
...@@ -5477,12 +5477,12 @@ static struct ftrace_func_command ftrace_snapshot_cmd = { ...@@ -5477,12 +5477,12 @@ static struct ftrace_func_command ftrace_snapshot_cmd = {
.func = ftrace_trace_snapshot_callback, .func = ftrace_trace_snapshot_callback,
}; };
static int register_snapshot_cmd(void) static __init int register_snapshot_cmd(void)
{ {
return register_ftrace_command(&ftrace_snapshot_cmd); return register_ftrace_command(&ftrace_snapshot_cmd);
} }
#else #else
static inline int register_snapshot_cmd(void) { return 0; } static inline __init int register_snapshot_cmd(void) { return 0; }
#endif /* defined(CONFIG_TRACER_SNAPSHOT) && defined(CONFIG_DYNAMIC_FTRACE) */ #endif /* defined(CONFIG_TRACER_SNAPSHOT) && defined(CONFIG_DYNAMIC_FTRACE) */
struct dentry *tracing_init_dentry_tr(struct trace_array *tr) struct dentry *tracing_init_dentry_tr(struct trace_array *tr)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment