summaryrefslogtreecommitdiffstats
path: root/include/linux/kernel.h
diff options
context:
space:
mode:
authorSteven Rostedt2009-12-14 21:58:33 +0100
committerIngo Molnar2009-12-15 08:36:11 +0100
commite36c54582c6f14adc9e10473e2aec2cc4f0acc03 (patch)
tree057c54ccfd431152486fd781070713ad0e34bb01 /include/linux/kernel.h
parentMerge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
downloadkernel-qcow2-linux-e36c54582c6f14adc9e10473e2aec2cc4f0acc03.tar.gz
kernel-qcow2-linux-e36c54582c6f14adc9e10473e2aec2cc4f0acc03.tar.xz
kernel-qcow2-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>
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r--include/linux/kernel.h1
1 files changed, 1 insertions, 0 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, ...)
{