Commit-ID: e36c54582c6f14adc9e10473e2aec2cc4f0acc03
Gitweb: http://git.kernel.org/tip/e36c54582c6f14adc9e10473e2aec2cc4f0acc03
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
AuthorDate: Mon, 14 Dec 2009 15:58:33 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 15 Dec 2009 08:36:11 +0100
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@xxxxxxx>
LKML-Reference: <20091214162713.GA31060@xxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
include/linux/kernel.h | 1 +
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 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 bd7b969..ee61915 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|