diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-07-21 09:32:40 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 09:32:40 +0200 |
commit | 40bcea7bbe8fe452a2d272e2ffd3dea281eec9ff (patch) | |
tree | aedb6d02e53e3cf84cc32fd81db84032cee205e1 /include | |
parent | Merge branch 'perf/urgent' into perf/core (diff) | |
parent | perf probe: Support adding probes on offline kernel modules (diff) | |
download | linux-40bcea7bbe8fe452a2d272e2ffd3dea281eec9ff.tar.xz linux-40bcea7bbe8fe452a2d272e2ffd3dea281eec9ff.zip |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ftrace_event.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h index b1e69eefc203..96efa6794ea5 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h @@ -76,6 +76,7 @@ struct trace_iterator { struct trace_entry *ent; unsigned long lost_events; int leftover; + int ent_size; int cpu; u64 ts; |