Skip to content

Commit

Permalink
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/git/acme/linux-2.6 into perf/core
  • Loading branch information
Ingo Molnar committed Dec 7, 2010
2 parents 10a18d7 + ce47dc5 commit 75b5293
Show file tree
Hide file tree
Showing 24 changed files with 787 additions and 379 deletions.
13 changes: 12 additions & 1 deletion include/linux/perf_event.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,9 @@ struct perf_event_attr {
*/
precise_ip : 2, /* skid constraint */
mmap_data : 1, /* non-exec mmap data */
sample_id_all : 1, /* sample_type all events */

__reserved_1 : 46;
__reserved_1 : 45;

union {
__u32 wakeup_events; /* wakeup every n events */
Expand Down Expand Up @@ -327,6 +328,15 @@ struct perf_event_header {
enum perf_event_type {

/*
* If perf_event_attr.sample_id_all is set then all event types will
* have the sample_type selected fields related to where/when
* (identity) an event took place (TID, TIME, ID, CPU, STREAM_ID)
* described in PERF_RECORD_SAMPLE below, it will be stashed just after
* the perf_event_header and the fields already present for the existing
* fields, i.e. at the end of the payload. That way a newer perf.data
* file will be supported by older perf tools, with these new optional
* fields being ignored.
*
* The MMAP events record the PROT_EXEC mappings so that we can
* correlate userspace IPs to code. They have the following structure:
*
Expand Down Expand Up @@ -759,6 +769,7 @@ struct perf_event {

struct perf_event_attr attr;
u16 header_size;
u16 id_header_size;
u16 read_size;
struct hw_perf_event hw;

Expand Down
Loading

0 comments on commit 75b5293

Please sign in to comment.