From 241645b847e53a78f5a528e73bfb5ee4e666dddd Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 14 Dec 2009 15:58:33 -0500
Subject: [PATCH] --- yaml --- r: 177353 b: refs/heads/master c:
 e36c54582c6f14adc9e10473e2aec2cc4f0acc03 h: refs/heads/master i:   177351:
 a9b79c9010d2ecc187c1d3e42f764dff81bc7b96 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 1 +
 trunk/kernel/trace/trace.c   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 45bb8bbb853c..a97745a6d5f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0087aabd6a3744c28114240776918f5d15e46b98
+refs/heads/master: e36c54582c6f14adc9e10473e2aec2cc4f0acc03
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 5ad4199fb073..f1dc752da0d2 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/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/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index bd7b969a729a..ee61915935d5 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/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);