diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-09 09:22:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-09 09:22:23 -0400 |
| commit | ad8537cda68a8fe81776cceca6c22d54dd652ea5 (patch) | |
| tree | bbef398c784fb884ca77fc2b7bee74c4ac5e1853 /arch/x86/include/asm/perf_event.h | |
| parent | 149936a068d83370c9dcd68894c276d4ba0f8560 (diff) | |
| parent | fab06992de6433af097c4a1d2d1b119812753ca7 (diff) | |
Merge branch 'perf/x86-ibs' into perf/core
Diffstat (limited to 'arch/x86/include/asm/perf_event.h')
| -rw-r--r-- | arch/x86/include/asm/perf_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 2291895b183..8a3c75d824b 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h | |||
| @@ -178,6 +178,8 @@ struct x86_pmu_capability { | |||
| 178 | #define IBS_FETCH_MAX_CNT 0x0000FFFFULL | 178 | #define IBS_FETCH_MAX_CNT 0x0000FFFFULL |
| 179 | 179 | ||
| 180 | /* IbsOpCtl bits */ | 180 | /* IbsOpCtl bits */ |
| 181 | /* lower 4 bits of the current count are ignored: */ | ||
| 182 | #define IBS_OP_CUR_CNT (0xFFFF0ULL<<32) | ||
| 181 | #define IBS_OP_CNT_CTL (1ULL<<19) | 183 | #define IBS_OP_CNT_CTL (1ULL<<19) |
| 182 | #define IBS_OP_VAL (1ULL<<18) | 184 | #define IBS_OP_VAL (1ULL<<18) |
| 183 | #define IBS_OP_ENABLE (1ULL<<17) | 185 | #define IBS_OP_ENABLE (1ULL<<17) |