# git rev-parse -q --verify e8f60cd7db24f94f2dbed6bec30dd16a68fc0828^{commit} e8f60cd7db24f94f2dbed6bec30dd16a68fc0828 already have revision, skipping fetch # git checkout -q -f -B kisskb e8f60cd7db24f94f2dbed6bec30dd16a68fc0828 # git clean -qxdf # < git log -1 # commit e8f60cd7db24f94f2dbed6bec30dd16a68fc0828 # Merge: 7dd4b804e080 cf129830ee82 # Author: Linus Torvalds # Date: Wed Jan 11 17:12:14 2023 -0600 # # Merge tag 'perf-tools-fixes-for-v6.2-2-2023-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # # - Make 'perf kmem' cope with the removal of some # kmem:kmem_cache_alloc_node and kmem:kmalloc_node in the # 11e9734bcb6a7361 ("mm/slab_common: unify NUMA and UMA version of # tracepoints") commit, making sure it works with Linux >= 6.2 as well # as with older kernels where those tracepoints are present. # # - Also make it handle the new "node" kmem:kmalloc and # kmem:kmem_cache_alloc tracepoint field introduced in that same # commit. # # - Fix hardware tracing PMU address filter duplicate symbol selection, # that was preventing to match with static functions with the same name # present in different object files. # # - Fix regression on what linux/types.h file gets used to build the "BPF # prologue" 'perf test' entry, the system one lacks the fmode_t # definition used in this test, so provide that type in the test # itself. # # - Avoid build breakage with libbpf < 0.8.0 + LIBBPF_DYNAMIC=1. If the # user asks for linking with the libbpf package provided by the distro, # then it has to be >= 0.8.0. Using the libbpf supplied with the kernel # would be a fallback in that case. # # - Fix the build when libbpf isn't available or explicitly disabled via # NO_LIBBPF=1. # # - Don't try to install libtraceevent plugins as its not anymore in the # kernel sources and will thus always fail. # # * tag 'perf-tools-fixes-for-v6.2-2-2023-01-11' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf auxtrace: Fix address filter duplicate symbol selection # perf bpf: Avoid build breakage with libbpf < 0.8.0 + LIBBPF_DYNAMIC=1 # perf build: Fix build error when NO_LIBBPF=1 # perf tools: Don't install libtraceevent plugins as its not anymore in the kernel sources # perf kmem: Support field "node" in evsel__process_alloc_event() coping with recent tracepoint restructuring # perf kmem: Support legacy tracepoints # perf build: Properly guard libbpf includes # perf tests bpf prologue: Fix bpf-script-test-prologue test compile issue with clang # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 e8f60cd7db24f94f2dbed6bec30dd16a68fc0828 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12645:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12650:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12652:warning: override: reassigning to symbol UML_NET_SLIP .config:12655:warning: override: reassigning to symbol UML_NET_MCAST .config:12657:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/um/os-Linux/util.c:17:24: fatal error: sys/random.h: No such file or directory compilation terminated. make[3]: *** [/kisskb/src/scripts/Makefile.build:252: arch/um/os-Linux/util.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:504: arch/um/os-Linux] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:94:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2157:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:2161:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:504: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:2008: .] Error 2 make: *** [Makefile:242: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:10:06.062595