diff options
Diffstat (limited to 'include/linux/perf_counter.h')
| -rw-r--r-- | include/linux/perf_counter.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h index 1fcd3cc93855..cef9931793fd 100644 --- a/include/linux/perf_counter.h +++ b/include/linux/perf_counter.h | |||
| @@ -140,7 +140,6 @@ struct perf_counter_hw_event { | |||
| 140 | __u64 read_format; | 140 | __u64 read_format; |
| 141 | 141 | ||
| 142 | __u64 disabled : 1, /* off by default */ | 142 | __u64 disabled : 1, /* off by default */ |
| 143 | nmi : 1, /* NMI sampling */ | ||
| 144 | inherit : 1, /* children inherit it */ | 143 | inherit : 1, /* children inherit it */ |
| 145 | pinned : 1, /* must always be on PMU */ | 144 | pinned : 1, /* must always be on PMU */ |
| 146 | exclusive : 1, /* only group on PMU */ | 145 | exclusive : 1, /* only group on PMU */ |
| @@ -153,7 +152,7 @@ struct perf_counter_hw_event { | |||
| 153 | comm : 1, /* include comm data */ | 152 | comm : 1, /* include comm data */ |
| 154 | freq : 1, /* use freq, not period */ | 153 | freq : 1, /* use freq, not period */ |
| 155 | 154 | ||
| 156 | __reserved_1 : 51; | 155 | __reserved_1 : 52; |
| 157 | 156 | ||
| 158 | __u32 wakeup_events; /* wakeup every n events */ | 157 | __u32 wakeup_events; /* wakeup every n events */ |
| 159 | __u32 __reserved_2; | 158 | __u32 __reserved_2; |
| @@ -354,7 +353,6 @@ struct hw_perf_counter { | |||
| 354 | u64 config; | 353 | u64 config; |
| 355 | unsigned long config_base; | 354 | unsigned long config_base; |
| 356 | unsigned long counter_base; | 355 | unsigned long counter_base; |
| 357 | int nmi; | ||
| 358 | int idx; | 356 | int idx; |
| 359 | }; | 357 | }; |
| 360 | union { /* software */ | 358 | union { /* software */ |