Messages in this thread Patch in this message | | | Date | Tue, 12 Nov 2019 11:18:19 -0000 | From | "tip-bot2 for Adrian Hunter" <> | Subject | [tip: perf/core] perf data: Move perf_dir_version into data.h |
| |
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 3dedec4f5ccc8048b9a2cfe89838c3b3275b6b2b Gitweb: https://git.kernel.org/tip/3dedec4f5ccc8048b9a2cfe89838c3b3275b6b2b Author: Adrian Hunter <adrian.hunter@intel.com> AuthorDate: Fri, 04 Oct 2019 11:31:18 +03:00 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitterDate: Wed, 06 Nov 2019 15:43:05 -03:00
perf data: Move perf_dir_version into data.h
perf_dir_version belongs to struct perf_data which is declared in data.h. To allow its use in inline perf_data functions, move perf_dir_version to data.h
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Jiri Olsa <jolsa@kernel.org> Link: http://lore.kernel.org/lkml/20191004083121.12182-3-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/data.h | 4 ++++ tools/perf/util/header.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/data.h b/tools/perf/util/data.h index 259868a..218fe9a 100644 --- a/tools/perf/util/data.h +++ b/tools/perf/util/data.h @@ -9,6 +9,10 @@ enum perf_data_mode { PERF_DATA_MODE_READ, }; +enum perf_dir_version { + PERF_DIR_VERSION = 1, +}; + struct perf_data_file { char *path; int fd; diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index ca53a92..840f95c 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -52,10 +52,6 @@ enum perf_header_version { PERF_HEADER_VERSION_2, }; -enum perf_dir_version { - PERF_DIR_VERSION = 1, -}; - struct perf_file_section { u64 offset; u64 size;
| |