diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-21 03:29:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 03:29:21 -0400 |
| commit | 492f73a303b488ffd67097b2351d54aa6e6c7c73 (patch) | |
| tree | 6e6c16fbd628bb5eb577cfc70a488ca286563e58 /kernel/trace/trace.h | |
| parent | e08fbb78f03fe2c4f88824faf6f51ce6af185e11 (diff) | |
| parent | f7bc8b61f65726ff98f52e286b28e294499d7a08 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: pick up the latest fixes - they won't make v3.0.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index a3e2db708072..30a94c26dcb3 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
| @@ -687,6 +687,7 @@ struct event_subsystem { | |||
| 687 | struct dentry *entry; | 687 | struct dentry *entry; |
| 688 | struct event_filter *filter; | 688 | struct event_filter *filter; |
| 689 | int nr_events; | 689 | int nr_events; |
| 690 | int ref_count; | ||
| 690 | }; | 691 | }; |
| 691 | 692 | ||
| 692 | #define FILTER_PRED_INVALID ((unsigned short)-1) | 693 | #define FILTER_PRED_INVALID ((unsigned short)-1) |