summaryrefslogtreecommitdiff
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-12-14 17:12:37 +0100
committerIngo Molnar <mingo@elte.hu>2009-12-14 17:12:37 +0100
commit0087aabd6a3744c28114240776918f5d15e46b98 (patch)
tree8bf3ba7b3395490441722360d2872480f64cd694 /kernel/trace/trace.c
parentcc0104e877fff32865a67b256d3a9ce52ff15790 (diff)
parentcc51a0fca66658ea710db566ba17e80e3f7d4957 (diff)
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 05076008f371..bd7b969a729a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1150,6 +1150,22 @@ void __trace_stack(struct trace_array *tr, unsigned long flags, int skip,
__ftrace_trace_stack(tr->buffer, flags, skip, pc);
}
+/**
+ * trace_dump_stack - record a stack back trace in the trace buffer
+ */
+void trace_dump_stack(void)
+{
+ unsigned long flags;
+
+ if (tracing_disabled || tracing_selftest_running)
+ return 0;
+
+ local_save_flags(flags);
+
+ /* skipping 3 traces, seems to get us at the caller of this function */
+ __ftrace_trace_stack(global_trace.buffer, flags, 3, preempt_count());
+}
+
void
ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc)
{