diff --git a/[refs] b/[refs] index b41f9a99dcee..45c02d8b1484 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b50311dc2ac1c04ad19163c2359910b25e16caf6 +refs/heads/master: cb5d76999029ae7a517cb07dfa732c1b5a934fc2 diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index fbbf5e598368..bd9f55a5958d 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/include/linux/perf_event.h @@ -192,6 +192,8 @@ enum perf_event_read_format { }; #define PERF_ATTR_SIZE_VER0 64 /* sizeof first published struct */ +#define PERF_ATTR_SIZE_VER1 72 /* add: config2 */ +#define PERF_ATTR_SIZE_VER2 80 /* add: branch_sample_type */ /* * Hardware event_id to monitor via a performance monitoring event: