From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 14 Dec 2009 20:58:33 +0000 (-0500)
Subject: tracing: Fix return of trace_dump_stack()
X-Git-Tag: v2.6.33-rc1~52^2
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=e36c54582c6f14adc9e10473e2aec2cc4f0acc03;p=net-next-2.6.git

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>
---

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 5ad4199fb07..f1dc752da0d 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 bd7b969a729..ee61915935d 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);