Commit b983d0de authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'tracing-fixes-for-linus' of...

Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tracing/function: Fix the return value of ftrace_trace_onoff_callback()
parents ecc2e05e 04aef32d
...@@ -363,7 +363,7 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable) ...@@ -363,7 +363,7 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
out_reg: out_reg:
ret = register_ftrace_function_probe(glob, ops, count); ret = register_ftrace_function_probe(glob, ops, count);
return ret; return ret < 0 ? ret : 0;
} }
static struct ftrace_func_command ftrace_traceon_cmd = { static struct ftrace_func_command ftrace_traceon_cmd = {
......
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