Commit 0d8dd67b authored by Song Liu's avatar Song Liu Committed by Ingo Molnar

perf/headers: Sync new perf_event.h with the tools/include/uapi version

perf_event.h is updated in previous patch, this patch applies the same
changes to the tools/ version. This is part is put in a separate
patch in case the two files are back ported separately.
Signed-off-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarYonghong Song <yhs@fb.com>
Reviewed-by: default avatarJosef Bacik <jbacik@fb.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Cc: <daniel@iogearbox.net>
Cc: <davem@davemloft.net>
Cc: <kernel-team@fb.com>
Cc: <rostedt@goodmis.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20171206224518.3598254-5-songliubraving@fb.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 65074d43
...@@ -380,10 +380,14 @@ struct perf_event_attr { ...@@ -380,10 +380,14 @@ struct perf_event_attr {
__u32 bp_type; __u32 bp_type;
union { union {
__u64 bp_addr; __u64 bp_addr;
__u64 kprobe_func; /* for perf_kprobe */
__u64 uprobe_path; /* for perf_uprobe */
__u64 config1; /* extension of config */ __u64 config1; /* extension of config */
}; };
union { union {
__u64 bp_len; __u64 bp_len;
__u64 kprobe_addr; /* when kprobe_func == NULL */
__u64 probe_offset; /* for perf_[k,u]probe */
__u64 config2; /* extension of config1 */ __u64 config2; /* extension of config1 */
}; };
__u64 branch_sample_type; /* enum perf_branch_sample_type */ __u64 branch_sample_type; /* enum perf_branch_sample_type */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment