# 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/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 e8f60cd7db24f94f2dbed6bec30dd16a68fc0828 # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 160 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:545, from /kisskb/src/include/linux/bitops.h:68, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:108: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:12: note: in definition of macro '__swab16' __fswab16(x)) ^ /kisskb/src/include/linux/printk.h:457:26: note: in expansion of macro 'printk_index_wrap' #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:3: note: in expansion of macro 'printk' printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); ^~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc8 # Build took: 0:01:06.408856