Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf beauty: Move arch/x86/include/asm/irq_vectors.h copy out of the directory used to build perf

It is 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.

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.

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>

+8 -6
tools/arch/x86/include/asm/irq_vectors.h tools/perf/trace/beauty/arch/x86/include/asm/irq_vectors.h
+4 -2
tools/perf/Makefile.perf
··· 474 474 beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/ 475 475 beauty_uapi_linux_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/linux/ 476 476 beauty_uapi_sound_dir := $(srctree)/tools/perf/trace/beauty/include/uapi/sound/ 477 + beauty_arch_asm_dir := $(srctree)/tools/perf/trace/beauty/arch/x86/include/asm/ 478 + 477 479 linux_uapi_dir := $(srctree)/tools/include/uapi/linux 478 480 asm_generic_uapi_dir := $(srctree)/tools/include/uapi/asm-generic 479 481 arch_asm_uapi_dir := $(srctree)/tools/arch/$(SRCARCH)/include/uapi/asm/ ··· 638 636 x86_arch_irq_vectors_array := $(beauty_outdir)/x86_arch_irq_vectors_array.c 639 637 x86_arch_irq_vectors_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh 640 638 641 - $(x86_arch_irq_vectors_array): $(x86_arch_asm_dir)/irq_vectors.h $(x86_arch_irq_vectors_tbl) 642 - $(Q)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(x86_arch_asm_dir) > $@ 639 + $(x86_arch_irq_vectors_array): $(beauty_arch_asm_dir)/irq_vectors.h $(x86_arch_irq_vectors_tbl) 640 + $(Q)$(SHELL) '$(x86_arch_irq_vectors_tbl)' $(beauty_arch_asm_dir) > $@ 643 641 644 642 x86_arch_MSRs_array := $(beauty_outdir)/x86_arch_MSRs_array.c 645 643 x86_arch_MSRs_tbl := $(srctree)/tools/perf/trace/beauty/tracepoints/x86_msr.sh
+1 -1
tools/perf/check-headers.sh
··· 34 34 "arch/x86/include/asm/cpufeatures.h" 35 35 "arch/x86/include/asm/inat_types.h" 36 36 "arch/x86/include/asm/emulate_prefix.h" 37 - "arch/x86/include/asm/irq_vectors.h" 38 37 "arch/x86/include/asm/msr-index.h" 39 38 "arch/x86/include/uapi/asm/prctl.h" 40 39 "arch/x86/lib/x86-opcode-map.txt" ··· 92 93 93 94 declare -a BEAUTY_FILES 94 95 BEAUTY_FILES=( 96 + "arch/x86/include/asm/irq_vectors.h" 95 97 "include/linux/socket.h" 96 98 "include/uapi/linux/fs.h" 97 99 "include/uapi/linux/mount.h"
+3 -3
tools/perf/trace/beauty/tracepoints/x86_irq_vectors.sh
··· 3 3 # (C) 2019, Arnaldo Carvalho de Melo <acme@redhat.com> 4 4 5 5 if [ $# -ne 1 ] ; then 6 - arch_x86_header_dir=tools/arch/x86/include/asm/ 6 + beauty_arch_asm_dir=tools/perf/trace/beauty/arch/x86/include/asm/ 7 7 else 8 - arch_x86_header_dir=$1 8 + beauty_arch_asm_dir=$1 9 9 fi 10 10 11 - x86_irq_vectors=${arch_x86_header_dir}/irq_vectors.h 11 + x86_irq_vectors=${beauty_arch_asm_dir}/irq_vectors.h 12 12 13 13 # FIRST_EXTERNAL_VECTOR is not that useful, find what is its number 14 14 # and then replace whatever is using it and that is useful, which at