diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-12-14 15:58:33 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-15 08:36:11 +0100 |
| commit | e36c54582c6f14adc9e10473e2aec2cc4f0acc03 (patch) | |
| tree | 057c54ccfd431152486fd781070713ad0e34bb01 | |
| parent | 0087aabd6a3744c28114240776918f5d15e46b98 (diff) | |
| download | blackbird-op-linux-e36c54582c6f14adc9e10473e2aec2cc4f0acc03.tar.gz blackbird-op-linux-e36c54582c6f14adc9e10473e2aec2cc4f0acc03.zip | |
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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/linux/kernel.h | 1 | ||||
| -rw-r--r-- | kernel/trace/trace.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5ad4199fb073..f1dc752da0d2 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 bd7b969a729a..ee61915935d5 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1158,7 +1158,7 @@ void trace_dump_stack(void) unsigned long flags; if (tracing_disabled || tracing_selftest_running) - return 0; + return; local_save_flags(flags); |
