---

yaml --- r: 177353 b: refs/heads/master c: e36c545 h: refs/heads/master i: 177351: a9b79c9 v: v3
git-mirror · Dec 15, 2009 · 241645b · 241645b
1 parent babc422
commit 241645b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);