ftrace: Add ops parameter to ftrace_startup/shutdown functions
In order to allow different ops to enable different functions,
the ftrace_startup() and ftrace_shutdown() functions need the
ops parameter passed to them.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 065f1e6..8fef1d9 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1522,10 +1522,8 @@
ftrace_run_update_code(command);
}
-static void ftrace_startup(int command)
+static void ftrace_startup(struct ftrace_ops *ops, int command)
{
- struct ftrace_ops *ops = &global_ops;
-
if (unlikely(ftrace_disabled))
return;
@@ -1539,10 +1537,8 @@
ftrace_startup_enable(command);
}
-static void ftrace_shutdown(int command)
+static void ftrace_shutdown(struct ftrace_ops *ops, int command)
{
- struct ftrace_ops *ops = &global_ops;
-
if (unlikely(ftrace_disabled))
return;
@@ -2362,7 +2358,7 @@
return;
__register_ftrace_function(&trace_probe_ops);
- ftrace_startup(0);
+ ftrace_startup(&global_ops, 0);
ftrace_probe_registered = 1;
}
@@ -2381,7 +2377,7 @@
/* no more funcs left */
__unregister_ftrace_function(&trace_probe_ops);
- ftrace_shutdown(0);
+ ftrace_shutdown(&global_ops, 0);
ftrace_probe_registered = 0;
}
@@ -3267,6 +3263,10 @@
#else
+struct ftrace_ops global_ops = {
+ .func = ftrace_stub,
+};
+
static int __init ftrace_nodyn_init(void)
{
ftrace_enabled = 1;
@@ -3277,8 +3277,8 @@
static inline int ftrace_init_dyn_debugfs(struct dentry *d_tracer) { return 0; }
static inline void ftrace_startup_enable(int command) { }
/* Keep as macros so we do not need to define the commands */
-# define ftrace_startup(command) do { } while (0)
-# define ftrace_shutdown(command) do { } while (0)
+# define ftrace_startup(ops, command) do { } while (0)
+# define ftrace_shutdown(ops, command) do { } while (0)
# define ftrace_startup_sysctl() do { } while (0)
# define ftrace_shutdown_sysctl() do { } while (0)
#endif /* CONFIG_DYNAMIC_FTRACE */
@@ -3583,7 +3583,7 @@
goto out_unlock;
ret = __register_ftrace_function(ops);
- ftrace_startup(0);
+ ftrace_startup(&global_ops, 0);
out_unlock:
mutex_unlock(&ftrace_lock);
@@ -3602,7 +3602,7 @@
mutex_lock(&ftrace_lock);
ret = __unregister_ftrace_function(ops);
- ftrace_shutdown(0);
+ ftrace_shutdown(&global_ops, 0);
mutex_unlock(&ftrace_lock);
return ret;
@@ -3825,7 +3825,7 @@
ftrace_graph_return = retfunc;
ftrace_graph_entry = entryfunc;
- ftrace_startup(FTRACE_START_FUNC_RET);
+ ftrace_startup(&global_ops, FTRACE_START_FUNC_RET);
out:
mutex_unlock(&ftrace_lock);
@@ -3842,7 +3842,7 @@
ftrace_graph_active--;
ftrace_graph_return = (trace_func_graph_ret_t)ftrace_stub;
ftrace_graph_entry = ftrace_graph_entry_stub;
- ftrace_shutdown(FTRACE_STOP_FUNC_RET);
+ ftrace_shutdown(&global_ops, FTRACE_STOP_FUNC_RET);
unregister_pm_notifier(&ftrace_suspend_notifier);
unregister_trace_sched_switch(ftrace_graph_probe_sched_switch, NULL);