From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Tue, 19 Dec 2023 00:37:07 +0000 (-0300)
Subject: Merge remote-tracking branch 'torvalds/master' into perf-tools-next
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/ab1c247094e323177a578b38f0325bf79f0317ac?hp=-c

Merge remote-tracking branch 'torvalds/master' into perf-tools-next

To pick up fixes that went thru perf-tools for v6.7 and to get in sync
with upstream to check for drift in the copies of headers, etc.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

ab1c247094e323177a578b38f0325bf79f0317ac
diff --combined tools/perf/Makefile.perf
index 1ab2a908f240,058c9aecf608..27e7c478880f
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@@ -134,8 -134,6 +134,8 @@@ include ../scripts/utilities.ma
  #	x86 instruction decoder - new instructions test
  #
  # Define GEN_VMLINUX_H to generate vmlinux.h from the BTF.
 +#
 +# Define NO_SHELLCHECK if you do not want to run shellcheck during build
  
  # As per kernel Makefile, avoid funny character set dependencies
  unexport LC_ALL
@@@ -229,15 -227,8 +229,15 @@@ els
    force_fixdep := $(config)
  endif
  
 +# Runs shellcheck on perf test shell scripts
 +ifeq ($(NO_SHELLCHECK),1)
 +  SHELLCHECK :=
 +else
 +  SHELLCHECK := $(shell which shellcheck 2> /dev/null)
 +endif
 +
  export srctree OUTPUT RM CC CXX LD AR CFLAGS CXXFLAGS V BISON FLEX AWK
 -export HOSTCC HOSTLD HOSTAR HOSTCFLAGS
 +export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK
  
  include $(srctree)/tools/build/Makefile.include
  
@@@ -443,6 -434,21 +443,21 @@@ export INSTALL SHELL_PAT
  
  SHELL = $(SHELL_PATH)
  
+ arm64_gen_sysreg_dir := $(srctree)/tools/arch/arm64/tools
+ ifneq ($(OUTPUT),)
+   arm64_gen_sysreg_outdir := $(OUTPUT)
+ else
+   arm64_gen_sysreg_outdir := $(CURDIR)
+ endif
+ 
+ arm64-sysreg-defs: FORCE
+ 	$(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir)
+ 
+ arm64-sysreg-defs-clean:
+ 	$(call QUIET_CLEAN,arm64-sysreg-defs)
+ 	$(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir) \
+ 		clean > /dev/null
+ 
  beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/
  linux_uapi_dir := $(srctree)/tools/include/uapi/linux
  asm_generic_uapi_dir := $(srctree)/tools/include/uapi/asm-generic
@@@ -732,7 -738,9 +747,9 @@@ endi
  __build-dir = $(subst $(OUTPUT),,$(dir $@))
  build-dir   = $(or $(__build-dir),.)
  
- prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioctl_array) \
+ prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders \
+ 	arm64-sysreg-defs \
+ 	$(drm_ioctl_array) \
  	$(fadvise_advice_array) \
  	$(fsconfig_arrays) \
  	$(fsmount_arrays) \
@@@ -1142,9 -1150,9 +1159,9 @@@ endif # CONFIG_PERF_BPF_SKE
  bpf-skel-clean:
  	$(call QUIET_CLEAN, bpf-skel) $(RM) -r $(SKEL_TMP_OUT) $(SKELETONS)
  
- clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
+ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(LIBPERF)-clean arm64-sysreg-defs-clean fixdep-clean python-clean bpf-skel-clean tests-coresight-targets-clean
  	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-iostat $(LANG_BINDINGS)
 -	$(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
 +	$(Q)find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete -o -name '*.shellcheck_log' -delete
  	$(Q)$(RM) $(OUTPUT).config-detected
  	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so
  	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
diff --combined tools/perf/util/Build
index 73e3f194f949,988473bf907a..132508ebe125
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@@ -195,7 -195,6 +195,7 @@@ endi
  perf-$(CONFIG_DWARF) += probe-finder.o
  perf-$(CONFIG_DWARF) += dwarf-aux.o
  perf-$(CONFIG_DWARF) += dwarf-regs.o
 +perf-$(CONFIG_DWARF) += debuginfo.o
  
  perf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
  perf-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind-local.o
@@@ -348,7 -347,7 +348,7 @@@ CFLAGS_rbtree.o        += -Wno-unused-p
  CFLAGS_libstring.o     += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
  CFLAGS_hweight.o       += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
  CFLAGS_header.o        += -include $(OUTPUT)PERF-VERSION-FILE
- CFLAGS_arm-spe.o       += -I$(srctree)/tools/arch/arm64/include/
+ CFLAGS_arm-spe.o       += -I$(srctree)/tools/arch/arm64/include/ -I$(OUTPUT)arch/arm64/include/generated/
  
  $(OUTPUT)util/argv_split.o: ../lib/argv_split.c FORCE
  	$(call rule_mkdir)