diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-18 10:36:11 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-18 10:36:11 -0300 |
| commit | 0698461ad2984892a47582a58eb235488d3aac7f (patch) | |
| tree | 107cfefee20b50f79cde3ed847f075bdbf50fad0 /tools/perf/util/header.h | |
| parent | 0d2997f750d1de394231bc22768dab94a5b5db2f (diff) | |
| parent | ff6992735ade75aae3e35d16b17da1008d753d28 (diff) | |
| download | lwn-0698461ad2984892a47582a58eb235488d3aac7f.tar.gz lwn-0698461ad2984892a47582a58eb235488d3aac7f.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To update the perf/core codebase.
Fix conflict by moving arch__post_evsel_config(evsel, attr) to the end
of evsel__config(), after what was added in:
49c692b7dfc9b6c0 ("perf offcpu: Accept allowed sample types only")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/header.h')
| -rw-r--r-- | tools/perf/util/header.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 5790bf556b90..2d5e601ba60f 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -136,6 +136,8 @@ int perf_session__inject_header(struct perf_session *session, int fd, struct feat_copier *fc); +size_t perf_session__data_offset(const struct evlist *evlist); + void perf_header__set_feat(struct perf_header *header, int feat); void perf_header__clear_feat(struct perf_header *header, int feat); bool perf_header__has_feat(const struct perf_header *header, int feat); |