1 files changed, 14 insertions, 7 deletions

diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 853bc1ccb395..9269de254874 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -163,8 +163,9 @@ enum perf_branch_sample_type {
         PERF_SAMPLE_BRANCH_ABORT_TX     = 1U << 7, /* transaction aborts */
         PERF_SAMPLE_BRANCH_IN_TX        = 1U << 8, /* in transaction */
         PERF_SAMPLE_BRANCH_NO_TX        = 1U << 9, /* not in transaction */
+        PERF_SAMPLE_BRANCH_COND         = 1U << 10, /* conditional branches */
 
-        PERF_SAMPLE_BRANCH_MAX          = 1U << 10, /* non-ABI */
+        PERF_SAMPLE_BRANCH_MAX          = 1U << 11, /* non-ABI */
 };
 
 #define PERF_SAMPLE_BRANCH_PLM_ALL \
@@ -301,8 +302,8 @@ struct perf_event_attr {
                                 exclude_callchain_kernel : 1, /* exclude kernel callchains */
                                 exclude_callchain_user   : 1, /* exclude user callchains */
                                 mmap2          :  1, /* include mmap with inode data     */
-
-                                __reserved_1   : 40;
+                                comm_exec      :  1, /* flag comm events that are due to an exec */
+                                __reserved_1   : 39;
 
         union {
                 __u32           wakeup_events;    /* wakeup every n events */
@@ -501,7 +502,12 @@ struct perf_event_mmap_page {
 #define PERF_RECORD_MISC_GUEST_KERNEL           (4 << 0)
 #define PERF_RECORD_MISC_GUEST_USER             (5 << 0)
 
+/*
+ * PERF_RECORD_MISC_MMAP_DATA and PERF_RECORD_MISC_COMM_EXEC are used on
+ * different events so can reuse the same bit position.
+ */
 #define PERF_RECORD_MISC_MMAP_DATA              (1 << 13)
+#define PERF_RECORD_MISC_COMM_EXEC              (1 << 13)
 /*
  * Indicates that the content of PERF_SAMPLE_IP points to
  * the actual instruction that triggered the event. See also
@@ -699,6 +705,7 @@ enum perf_event_type {
          *      u32                             min;
          *      u64                             ino;
          *      u64                             ino_generation;
+         *      u32                             prot, flags;
          *      char                            filename[];
          *      struct sample_id                sample_id;
          * };
@@ -722,10 +729,10 @@ enum perf_callchain_context {
         PERF_CONTEXT_MAX                = (__u64)-4095,
 };
 
-#define PERF_FLAG_FD_NO_GROUP           (1U << 0)
-#define PERF_FLAG_FD_OUTPUT             (1U << 1)
-#define PERF_FLAG_PID_CGROUP            (1U << 2) /* pid=cgroup id, per-cpu mode only */
-#define PERF_FLAG_FD_CLOEXEC            (1U << 3) /* O_CLOEXEC */
+#define PERF_FLAG_FD_NO_GROUP           (1UL << 0)
+#define PERF_FLAG_FD_OUTPUT             (1UL << 1)
+#define PERF_FLAG_PID_CGROUP            (1UL << 2) /* pid=cgroup id, per-cpu mode only */
+#define PERF_FLAG_FD_CLOEXEC            (1UL << 3) /* O_CLOEXEC */
 
 union perf_mem_data_src {
         __u64 val;