diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-21 03:32:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 03:32:40 -0400 |
| commit | 40bcea7bbe8fe452a2d272e2ffd3dea281eec9ff (patch) | |
| tree | aedb6d02e53e3cf84cc32fd81db84032cee205e1 /include | |
| parent | 492f73a303b488ffd67097b2351d54aa6e6c7c73 (diff) | |
| parent | 14a8fd7ceea6915c613746203d6e9a2bf273f16c (diff) | |
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 b1e69eefc20..96efa6794ea 100644 --- a/include/linux/ftrace_event.h +++ b/include/linux/ftrace_event.h | |||
| @@ -76,6 +76,7 @@ struct trace_iterator { | |||
| 76 | struct trace_entry *ent; | 76 | struct trace_entry *ent; |
| 77 | unsigned long lost_events; | 77 | unsigned long lost_events; |
| 78 | int leftover; | 78 | int leftover; |
| 79 | int ent_size; | ||
| 79 | int cpu; | 80 | int cpu; |
| 80 | u64 ts; | 81 | u64 ts; |
| 81 | 82 | ||