aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-06 11:12:17 +0200
committerIngo Molnar <mingo@kernel.org>2012-07-06 11:12:17 +0200
commit35c2f48c66d9c1b8d794c3936c3be22aa7c89adb (patch)
treede0233d45fec273920bce0bc8640465cbf439600 /kernel/trace/trace.h
parent47fbc518a4b5c9a949f7cab8b14a00d3549bf138 (diff)
parenta5fb833172eca69136e9ee1ada778e404086ab8a (diff)
downloadkernel_replicant_linux-35c2f48c66d9c1b8d794c3936c3be22aa7c89adb.tar.gz
kernel_replicant_linux-35c2f48c66d9c1b8d794c3936c3be22aa7c89adb.tar.bz2
kernel_replicant_linux-35c2f48c66d9c1b8d794c3936c3be22aa7c89adb.zip
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 5aec220d2de0..55e1f7f0db12 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -317,6 +317,14 @@ struct tracer {
#define TRACE_PIPE_ALL_CPU -1
+static inline struct ring_buffer_iter *
+trace_buffer_iter(struct trace_iterator *iter, int cpu)
+{
+ if (iter->buffer_iter && iter->buffer_iter[cpu])
+ return iter->buffer_iter[cpu];
+ return NULL;
+}
+
int tracer_init(struct tracer *t, struct trace_array *tr);
int tracing_is_enabled(void);
void trace_wake_up(void);