diff options
Diffstat (limited to 'include/uapi/linux/perf_event.h')
-rw-r--r-- | include/uapi/linux/perf_event.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index e46b93279e3d..1e3cd07cf76e 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h | |||
@@ -166,6 +166,8 @@ enum perf_branch_sample_type_shift { | |||
166 | PERF_SAMPLE_BRANCH_NO_TX_SHIFT = 9, /* not in transaction */ | 166 | PERF_SAMPLE_BRANCH_NO_TX_SHIFT = 9, /* not in transaction */ |
167 | PERF_SAMPLE_BRANCH_COND_SHIFT = 10, /* conditional branches */ | 167 | PERF_SAMPLE_BRANCH_COND_SHIFT = 10, /* conditional branches */ |
168 | 168 | ||
169 | PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT = 11, /* call/ret stack */ | ||
170 | |||
169 | PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */ | 171 | PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */ |
170 | }; | 172 | }; |
171 | 173 | ||
@@ -175,18 +177,16 @@ enum perf_branch_sample_type { | |||
175 | PERF_SAMPLE_BRANCH_HV = 1U << PERF_SAMPLE_BRANCH_HV_SHIFT, | 177 | PERF_SAMPLE_BRANCH_HV = 1U << PERF_SAMPLE_BRANCH_HV_SHIFT, |
176 | 178 | ||
177 | PERF_SAMPLE_BRANCH_ANY = 1U << PERF_SAMPLE_BRANCH_ANY_SHIFT, | 179 | PERF_SAMPLE_BRANCH_ANY = 1U << PERF_SAMPLE_BRANCH_ANY_SHIFT, |
178 | PERF_SAMPLE_BRANCH_ANY_CALL = | 180 | PERF_SAMPLE_BRANCH_ANY_CALL = 1U << PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT, |
179 | 1U << PERF_SAMPLE_BRANCH_ANY_CALL_SHIFT, | 181 | PERF_SAMPLE_BRANCH_ANY_RETURN = 1U << PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT, |
180 | PERF_SAMPLE_BRANCH_ANY_RETURN = | 182 | PERF_SAMPLE_BRANCH_IND_CALL = 1U << PERF_SAMPLE_BRANCH_IND_CALL_SHIFT, |
181 | 1U << PERF_SAMPLE_BRANCH_ANY_RETURN_SHIFT, | 183 | PERF_SAMPLE_BRANCH_ABORT_TX = 1U << PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT, |
182 | PERF_SAMPLE_BRANCH_IND_CALL = | ||
183 | 1U << PERF_SAMPLE_BRANCH_IND_CALL_SHIFT, | ||
184 | PERF_SAMPLE_BRANCH_ABORT_TX = | ||
185 | 1U << PERF_SAMPLE_BRANCH_ABORT_TX_SHIFT, | ||
186 | PERF_SAMPLE_BRANCH_IN_TX = 1U << PERF_SAMPLE_BRANCH_IN_TX_SHIFT, | 184 | PERF_SAMPLE_BRANCH_IN_TX = 1U << PERF_SAMPLE_BRANCH_IN_TX_SHIFT, |
187 | PERF_SAMPLE_BRANCH_NO_TX = 1U << PERF_SAMPLE_BRANCH_NO_TX_SHIFT, | 185 | PERF_SAMPLE_BRANCH_NO_TX = 1U << PERF_SAMPLE_BRANCH_NO_TX_SHIFT, |
188 | PERF_SAMPLE_BRANCH_COND = 1U << PERF_SAMPLE_BRANCH_COND_SHIFT, | 186 | PERF_SAMPLE_BRANCH_COND = 1U << PERF_SAMPLE_BRANCH_COND_SHIFT, |
189 | 187 | ||
188 | PERF_SAMPLE_BRANCH_CALL_STACK = 1U << PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT, | ||
189 | |||
190 | PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT, | 190 | PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT, |
191 | }; | 191 | }; |
192 | 192 | ||