diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-06 21:07:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-06 21:07:38 +0200 |
| commit | 57d524154ffe99d27fb55e0e30ddbad9f4c35806 (patch) | |
| tree | 406ce0543fa294d41ab8204ca531ab18453e5a1a /include | |
| parent | e04d1b23f9706186187dcb0be1a752e48dcc540b (diff) | |
| parent | c63ca0c01d73563d4e2ab174bb3dd1e5efb907e6 (diff) | |
| download | linux-stable-57d524154ffe99d27fb55e0e30ddbad9f4c35806.tar.gz linux-stable-57d524154ffe99d27fb55e0e30ddbad9f4c35806.tar.bz2 linux-stable-57d524154ffe99d27fb55e0e30ddbad9f4c35806.zip | |
Merge branch 'perf/stat' into perf/core
Merge reason: the perf stat improvements are tested and ready now.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/perf_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 207c16976a17..3412684ce5d5 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -52,6 +52,8 @@ enum perf_hw_id { PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 4, PERF_COUNT_HW_BRANCH_MISSES = 5, PERF_COUNT_HW_BUS_CYCLES = 6, + PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 7, + PERF_COUNT_HW_STALLED_CYCLES_BACKEND = 8, PERF_COUNT_HW_MAX, /* non-ABI */ }; |