mirror of
https://github.com/torvalds/linux
synced 2024-09-29 16:00:27 +00:00
perf beauty: Move uapi/linux/fs.h copy out of the directory used to build perf
It is mostly used only to generate string tables, not to build perf, so move it to the tools/perf/trace/beauty/include/ hierarchy, that is used just for scraping. The only case where it was being used to build was in tools/perf/trace/beauty/sync_file_range.c, because some older systems doesn't have the SYNC_FILE_RANGE_WRITE_AND_WAIT define, just use the system's linux/fs.h header instead, defining it if not available. This is a something that should've have happened, as happened with the linux/socket.h scrapper, do it now as Ian suggested while doing an audit/refactor session in the headers used by perf. No other tools/ living code uses it, just <linux/fs.h> coming from either 'make install_headers' or from the system /usr/include/ directory. Suggested-by: Ian Rogers <irogers@google.com> Reviewed-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/lkml/CAP-5=fWZVrpRufO4w-S4EcSi9STXcTAN2ERLwTSN7yrSSA-otQ@mail.gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
5d8c646038
commit
faf7217a39
|
@ -472,6 +472,7 @@ arm64-sysreg-defs-clean:
|
|||
clean > /dev/null
|
||||
|
||||
beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/
|
||||
beauty_uapi_linux_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/linux/
|
||||
linux_uapi_dir := $(srctree)/tools/include/uapi/linux
|
||||
asm_generic_uapi_dir := $(srctree)/tools/include/uapi/asm-generic
|
||||
arch_asm_uapi_dir := $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/
|
||||
|
@ -647,8 +648,8 @@ $(x86_arch_MSRs_array): $(x86_arch_asm_dir)/msr-index.h $(x86_arch_MSRs_tbl)
|
|||
rename_flags_array := $(beauty_outdir)/rename_flags_array.c
|
||||
rename_flags_tbl := $(srctree)/tools/perf/trace/beauty/rename_flags.sh
|
||||
|
||||
$(rename_flags_array): $(linux_uapi_dir)/fs.h $(rename_flags_tbl)
|
||||
$(Q)$(SHELL) '$(rename_flags_tbl)' $(linux_uapi_dir) > $@
|
||||
$(rename_flags_array): $(beauty_uapi_linux_dir)/fs.h $(rename_flags_tbl)
|
||||
$(Q)$(SHELL) '$(rename_flags_tbl)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
arch_errno_name_array := $(beauty_outdir)/arch_errno_name_array.c
|
||||
arch_errno_hdr_dir := $(srctree)/tools
|
||||
|
@ -660,8 +661,8 @@ $(arch_errno_name_array): $(arch_errno_tbl)
|
|||
sync_file_range_arrays := $(beauty_outdir)/sync_file_range_arrays.c
|
||||
sync_file_range_tbls := $(srctree)/tools/perf/trace/beauty/sync_file_range.sh
|
||||
|
||||
$(sync_file_range_arrays): $(linux_uapi_dir)/fs.h $(sync_file_range_tbls)
|
||||
$(Q)$(SHELL) '$(sync_file_range_tbls)' $(linux_uapi_dir) > $@
|
||||
$(sync_file_range_arrays): $(beauty_uapi_linux_dir)/fs.h $(sync_file_range_tbls)
|
||||
$(Q)$(SHELL) '$(sync_file_range_tbls)' $(beauty_uapi_linux_dir) > $@
|
||||
|
||||
TESTS_CORESIGHT_DIR := $(srctree)/tools/perf/tests/shell/coresight
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ FILES=(
|
|||
"include/uapi/drm/i915_drm.h"
|
||||
"include/uapi/linux/fadvise.h"
|
||||
"include/uapi/linux/fcntl.h"
|
||||
"include/uapi/linux/fs.h"
|
||||
"include/uapi/linux/fscrypt.h"
|
||||
"include/uapi/linux/kcmp.h"
|
||||
"include/uapi/linux/kvm.h"
|
||||
|
@ -98,6 +97,7 @@ SYNC_CHECK_FILES=(
|
|||
declare -a BEAUTY_FILES
|
||||
BEAUTY_FILES=(
|
||||
"include/linux/socket.h"
|
||||
"include/uapi/linux/fs.h"
|
||||
)
|
||||
|
||||
declare -a FAILURES
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# Copyright (C) 2018, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
|
||||
# SPDX-License-Identifier: LGPL-2.1
|
||||
|
||||
[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/include/uapi/linux/
|
||||
[ $# -eq 1 ] && header_dir=$1 || header_dir=tools/perf/trace/beauty/include/uapi/linux/
|
||||
|
||||
fs_header=${header_dir}/fs.h
|
||||
|
||||
|
|
|
@ -7,7 +7,16 @@
|
|||
|
||||
#include "trace/beauty/beauty.h"
|
||||
#include <linux/log2.h>
|
||||
#include <uapi/linux/fs.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
#ifndef SYNC_FILE_RANGE_WRITE_AND_WAIT
|
||||
#define SYNC_FILE_RANGE_WAIT_BEFORE 1
|
||||
#define SYNC_FILE_RANGE_WRITE 2
|
||||
#define SYNC_FILE_RANGE_WAIT_AFTER 4
|
||||
#define SYNC_FILE_RANGE_WRITE_AND_WAIT (SYNC_FILE_RANGE_WRITE | \
|
||||
SYNC_FILE_RANGE_WAIT_BEFORE | \
|
||||
SYNC_FILE_RANGE_WAIT_AFTER)
|
||||
#endif
|
||||
|
||||
static size_t sync_file_range__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# SPDX-License-Identifier: LGPL-2.1
|
||||
|
||||
if [ $# -ne 1 ] ; then
|
||||
linux_header_dir=tools/include/uapi/linux
|
||||
linux_header_dir=tools/perf/trace/beauty/include/uapi/linux/
|
||||
else
|
||||
linux_header_dir=$1
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue