Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / x86 / events / intel / pt.h

diff --git a/arch/x86/events/intel/pt.h b/arch/x86/events/intel/pt.h
index 63fe4063fbd69f7b2e907c41febfb58fd9dee05c..1d2bb75723741461b47b70825fe3475cf9531127 100644 (file)
--- a/arch/x86/events/intel/pt.h
+++ b/arch/x86/events/intel/pt.h
@@ -53,7 +53,6 @@ struct pt_pmu {
 /**
  * struct pt_buffer - buffer configuration; one buffer per task_struct or
  *             cpu, depending on perf event configuration
- * @cpu:       cpu for per-cpu allocation
  * @tables:    list of ToPA tables in this buffer
  * @first:     shorthand for first topa table
  * @last:      shorthand for last topa table
@@ -65,13 +64,14 @@ struct pt_pmu {
  * @lost:      if data was lost/truncated
  * @head:      logical write offset inside the buffer
  * @snapshot:  if this is for a snapshot/overwrite counter
- * @stop_pos:  STOP topa entry in the buffer
- * @intr_pos:  INT topa entry in the buffer
+ * @stop_pos:  STOP topa entry index
+ * @intr_pos:  INT topa entry index
+ * @stop_te:   STOP topa entry pointer
+ * @intr_te:   INT topa entry pointer
  * @data_pages:        array of pages from perf
  * @topa_index:        table of topa entries indexed by page offset
  */
 struct pt_buffer {
-       int                     cpu;
        struct list_head        tables;
        struct topa             *first, *last, *cur;
        unsigned int            cur_idx;
@@ -80,9 +80,9 @@ struct pt_buffer {
        local_t                 data_size;
        local64_t               head;
        bool                    snapshot;
-       unsigned long           stop_pos, intr_pos;
+       long                    stop_pos, intr_pos;
+       struct topa_entry       *stop_te, *intr_te;
        void                    **data_pages;
-       struct topa_entry       *topa_index[0];
 };
 
 #define PT_FILTERS_NUM 4