← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to include/linux/perf_event.h

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/linux/perf_event.h
584
584
        struct perf_regs_user           regs_user;
585
585
        u64                             stack_user_size;
586
586
        u64                             weight;
 
587
        /*
 
588
         * Transaction flags for abort events:
 
589
         */
 
590
        u64                             txn;
587
591
};
588
592
 
589
593
static inline void perf_sample_data_init(struct perf_sample_data *data,
599
603
        data->stack_user_size = 0;
600
604
        data->weight = 0;
601
605
        data->data_src.val = 0;
 
606
        data->txn = 0;
602
607
}
603
608
 
604
609
extern void perf_output_sample(struct perf_output_handle *handle,