Messages in this thread Patch in this message |  | | Date | Fri, 17 Jul 2009 15:22:18 +0200 (CEST) | From | Thomas Gleixner <> | Subject | [GIT pull] tracing fixes for 2.6.31 |
| |
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
tglx
------------------> Xiao Guangrong (1): tracing/function: Fix the return value of ftrace_trace_onoff_callback()
kernel/trace/trace_functions.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 7402144..75ef000 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -363,7 +363,7 @@ ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable) out_reg: ret = register_ftrace_function_probe(glob, ops, count); - return ret; + return ret < 0 ? ret : 0; } static struct ftrace_func_command ftrace_traceon_cmd = {
|  |