Messages in this thread Patch in this message | | | Subject | [PATCH][GIT PULL] tracing: Fix return of trace_dump_stack() | From | Steven Rostedt <> | Date | Mon, 14 Dec 2009 16:44:34 -0500 |
| |
Ingo,
Please pull the latest tip/tracing/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git tip/tracing/urgent
Steven Rostedt (1): tracing: Fix return of trace_dump_stack()
---- include/linux/kernel.h | 1 + kernel/trace/trace.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) --------------------------- commit aa43d935e677296088fb9b9c2060abbad0ccf648 Author: Steven Rostedt <srostedt@redhat.com> Date: Mon Dec 14 15:58:33 2009 -0500
tracing: Fix return of trace_dump_stack() The trace_dump_stack() returned a value for a void function. Also, added the missing stub for trace_dump_stack() when tracing is not configured. Reported-by: Ingo Molnar <mingo@elte.hu> LKML-Reference: <20091214162713.GA31060@elte.hu> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5ad4199..f1dc752 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -527,6 +527,7 @@ trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); static inline void tracing_start(void) { } static inline void tracing_stop(void) { } static inline void ftrace_off_permanent(void) { } +static inline void trace_dump_stack(void) { } static inline int trace_printk(const char *fmt, ...) { diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f531301..1cf8734 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1159,7 +1159,7 @@ void trace_dump_stack(void) unsigned long flags; if (tracing_disabled || tracing_selftest_running) - return 0; + return; local_save_flags(flags);
| |