perf_counter: Fix tracepoint sampling to be part of generic sampling

[pandora-kernel.git] / include / linux / perf_counter.h

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index a67dd5c..2aabe43 100644 (file)
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -121,7 +121,7 @@ enum perf_counter_sample_format {
        PERF_SAMPLE_CPU                         = 1U << 7,
        PERF_SAMPLE_PERIOD                      = 1U << 8,
        PERF_SAMPLE_STREAM_ID                   = 1U << 9,
-       PERF_SAMPLE_TP_RECORD                   = 1U << 10,
+       PERF_SAMPLE_RAW                         = 1U << 10,
 
        PERF_SAMPLE_MAX = 1U << 11,             /* non-ABI */
 };
@@ -414,9 +414,9 @@ struct perf_callchain_entry {
        __u64                           ip[PERF_MAX_STACK_DEPTH];
 };
 
-struct perf_tracepoint_record {
-       int                             size;
-       char                            *record;
+struct perf_raw_record {
+       u32                             size;
+       void                            *data;
 };
 
 struct task_struct;
@@ -687,7 +687,7 @@ struct perf_sample_data {
        struct pt_regs                  *regs;
        u64                             addr;
        u64                             period;
-       void                            *private;
+       struct perf_raw_record          *raw;
 };
 
 extern int perf_counter_overflow(struct perf_counter *counter, int nmi,