# git rev-parse -q --verify 40c843218f11625722e9a7c3ced81a83b95ecf05^{commit} 40c843218f11625722e9a7c3ced81a83b95ecf05 already have revision, skipping fetch # git checkout -q -f -B kisskb 40c843218f11625722e9a7c3ced81a83b95ecf05 # git clean -qxdf # < git log -1 # commit 40c843218f11625722e9a7c3ced81a83b95ecf05 # Merge: 67bfce0e0192 f0ac5b85810a # Author: Linus Torvalds # Date: Sun Jan 23 08:14:21 2022 +0200 # # Merge tag 'perf-tools-for-v5.17-2022-01-22' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull more perf tools updates from Arnaldo Carvalho de Melo: # # - Fix printing 'phys_addr' in 'perf script'. # # - Fix failure to add events with 'perf probe' in ppc64 due to not # removing leading dot (ppc64 ABIv1). # # - Fix cpu_map__item() python binding building. # # - Support event alias in form foo-bar-baz, add pmu-events and # parse-event tests for it. # # - No need to setup affinities when starting a workload or attaching to # a pid. # # - Use path__join() to compose a path instead of ad-hoc snprintf() # equivalent. # # - Override attr->sample_period for non-libpfm4 events. # # - Use libperf cpumap APIs instead of accessing the internal state # directly. # # - Sync x86 arch prctl headers and files changed by the new # set_mempolicy_home_node syscall with the kernel sources. # # - Remove duplicate include in cpumap.h. # # - Remove redundant err variable. # # * tag 'perf-tools-for-v5.17-2022-01-22' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf tools: Remove redundant err variable # perf test: Add parse-events test for aliases with hyphens # perf test: Add pmu-events test for aliases with hyphens # perf parse-events: Support event alias in form foo-bar-baz # perf evsel: Override attr->sample_period for non-libpfm4 events # perf cpumap: Remove duplicate include in cpumap.h # perf cpumap: Migrate to libperf cpumap api # perf python: Fix cpu_map__item() building # perf script: Fix printing 'phys_addr' failure issue # tools headers UAPI: Sync files changed by new set_mempolicy_home_node syscall # tools headers UAPI: Sync x86 arch prctl headers with the kernel sources # perf machine: Use path__join() to compose a path instead of snprintf(dir, '/', filename) # perf evlist: No need to setup affinities when disabling events for pid targets # perf evlist: No need to setup affinities when enabling events for pid targets # perf stat: No need to setup affinities when starting a workload # perf affinity: Allow passing a NULL arg to affinity__cleanup() # perf probe: Fix ppc64 'perf probe add events failed' case # < /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 40c843218f11625722e9a7c3ced81a83b95ecf05 # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # 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 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_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 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12231:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12234:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12236:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12238:warning: override: reassigning to symbol UML_NET_SLIP .config:12241:warning: override: reassigning to symbol UML_NET_MCAST .config:12243:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c: In function 'vfio_pci_vga_rw': /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:11: error: implicit declaration of function 'ioport_map' [-Werror=implicit-function-declaration] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:324:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3c0, 0x3df - 0x3c0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:338:15: error: implicit declaration of function 'ioport_unmap' [-Werror=implicit-function-declaration] is_ioport ? ioport_unmap(iomem) : iounmap(iomem); ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/vfio/pci/vfio_pci_rdwr.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio/pci] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio] 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:25: /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:103: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:1556: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:1560:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1831: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allyesconfig_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-allyesconfig_um-x86_64 # Build took: 0:10:57.384070