diff options
Diffstat (limited to 'include/linux/perf_counter.h')
-rw-r--r-- | include/linux/perf_counter.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h index a67dd5c5b6d3..a9d823a93fe8 100644 --- a/include/linux/perf_counter.h +++ b/include/linux/perf_counter.h | |||
@@ -121,7 +121,7 @@ enum perf_counter_sample_format { | |||
121 | PERF_SAMPLE_CPU = 1U << 7, | 121 | PERF_SAMPLE_CPU = 1U << 7, |
122 | PERF_SAMPLE_PERIOD = 1U << 8, | 122 | PERF_SAMPLE_PERIOD = 1U << 8, |
123 | PERF_SAMPLE_STREAM_ID = 1U << 9, | 123 | PERF_SAMPLE_STREAM_ID = 1U << 9, |
124 | PERF_SAMPLE_TP_RECORD = 1U << 10, | 124 | PERF_SAMPLE_RAW = 1U << 10, |
125 | 125 | ||
126 | PERF_SAMPLE_MAX = 1U << 11, /* non-ABI */ | 126 | PERF_SAMPLE_MAX = 1U << 11, /* non-ABI */ |
127 | }; | 127 | }; |
@@ -369,6 +369,8 @@ enum perf_event_type { | |||
369 | * | 369 | * |
370 | * { u64 nr, | 370 | * { u64 nr, |
371 | * u64 ips[nr]; } && PERF_SAMPLE_CALLCHAIN | 371 | * u64 ips[nr]; } && PERF_SAMPLE_CALLCHAIN |
372 | * { u32 size; | ||
373 | * char data[size];}&& PERF_SAMPLE_RAW | ||
372 | * }; | 374 | * }; |
373 | */ | 375 | */ |
374 | PERF_EVENT_SAMPLE = 9, | 376 | PERF_EVENT_SAMPLE = 9, |
@@ -414,9 +416,9 @@ struct perf_callchain_entry { | |||
414 | __u64 ip[PERF_MAX_STACK_DEPTH]; | 416 | __u64 ip[PERF_MAX_STACK_DEPTH]; |
415 | }; | 417 | }; |
416 | 418 | ||
417 | struct perf_tracepoint_record { | 419 | struct perf_raw_record { |
418 | int size; | 420 | u32 size; |
419 | char *record; | 421 | void *data; |
420 | }; | 422 | }; |
421 | 423 | ||
422 | struct task_struct; | 424 | struct task_struct; |
@@ -687,7 +689,7 @@ struct perf_sample_data { | |||
687 | struct pt_regs *regs; | 689 | struct pt_regs *regs; |
688 | u64 addr; | 690 | u64 addr; |
689 | u64 period; | 691 | u64 period; |
690 | void *private; | 692 | struct perf_raw_record *raw; |
691 | }; | 693 | }; |
692 | 694 | ||
693 | extern int perf_counter_overflow(struct perf_counter *counter, int nmi, | 695 | extern int perf_counter_overflow(struct perf_counter *counter, int nmi, |