diff options
Diffstat (limited to 'include/linux/perf_event.h')
-rw-r--r-- | include/linux/perf_event.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index abb2776be1ba..412b790f5da6 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
@@ -291,12 +291,14 @@ struct perf_event_mmap_page { | |||
291 | __s64 offset; /* add to hardware event value */ | 291 | __s64 offset; /* add to hardware event value */ |
292 | __u64 time_enabled; /* time event active */ | 292 | __u64 time_enabled; /* time event active */ |
293 | __u64 time_running; /* time event on cpu */ | 293 | __u64 time_running; /* time event on cpu */ |
294 | __u32 time_mult, time_shift; | ||
295 | __u64 time_offset; | ||
294 | 296 | ||
295 | /* | 297 | /* |
296 | * Hole for extension of the self monitor capabilities | 298 | * Hole for extension of the self monitor capabilities |
297 | */ | 299 | */ |
298 | 300 | ||
299 | __u64 __reserved[123]; /* align to 1k */ | 301 | __u64 __reserved[121]; /* align to 1k */ |
300 | 302 | ||
301 | /* | 303 | /* |
302 | * Control data for the mmap() data buffer. | 304 | * Control data for the mmap() data buffer. |
@@ -616,6 +618,7 @@ struct pmu { | |||
616 | struct list_head entry; | 618 | struct list_head entry; |
617 | 619 | ||
618 | struct device *dev; | 620 | struct device *dev; |
621 | const struct attribute_group **attr_groups; | ||
619 | char *name; | 622 | char *name; |
620 | int type; | 623 | int type; |
621 | 624 | ||
@@ -681,6 +684,12 @@ struct pmu { | |||
681 | * for each successful ->add() during the transaction. | 684 | * for each successful ->add() during the transaction. |
682 | */ | 685 | */ |
683 | void (*cancel_txn) (struct pmu *pmu); /* optional */ | 686 | void (*cancel_txn) (struct pmu *pmu); /* optional */ |
687 | |||
688 | /* | ||
689 | * Will return the value for perf_event_mmap_page::index for this event, | ||
690 | * if no implementation is provided it will default to: event->hw.idx + 1. | ||
691 | */ | ||
692 | int (*event_idx) (struct perf_event *event); /*optional */ | ||
684 | }; | 693 | }; |
685 | 694 | ||
686 | /** | 695 | /** |