summaryrefslogtreecommitdiff
path: root/include/linux/ftrace_event.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-12-10 08:18:41 +0100
committerIngo Molnar <mingo@elte.hu>2009-12-10 08:18:41 +0100
commit788d70dce0184eccc249ac6f05aa38b385b7497c (patch)
tree607f2d23bab877a530bbd3b7da2b9fd9e6c24ce1 /include/linux/ftrace_event.h
parent2b876f95d03e226394b5d360c86127cbefaf614b (diff)
parentf2942487ffb0c0a80b2312f667ea30dd55a24bb0 (diff)
Merge branch 'tip/tracing/core3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'include/linux/ftrace_event.h')
-rw-r--r--include/linux/ftrace_event.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 47bbdf9c38d0..38f8d6553831 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -57,6 +57,7 @@ struct trace_iterator {
/* The below is zeroed out in pipe_read */
struct trace_seq seq;
struct trace_entry *ent;
+ int leftover;
int cpu;
u64 ts;