# git rev-parse -q --verify b229b6ca5abbd63ff40c1396095b1b36b18139c3^{commit} b229b6ca5abbd63ff40c1396095b1b36b18139c3 already have revision, skipping fetch # git checkout -q -f -B kisskb b229b6ca5abbd63ff40c1396095b1b36b18139c3 # git clean -qxdf # < git log -1 # commit b229b6ca5abbd63ff40c1396095b1b36b18139c3 # Merge: a2718383ef9d e9229d5b6254 # Author: Linus Torvalds # Date: Wed Oct 26 17:44:10 2022 -0700 # # Merge tag 'perf-tools-fixes-for-v6.1-2022-10-26' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tool fixes from Arnaldo Carvalho de Melo: # # - Fix some aspects of building with an older (than the one in the # kernel sources) libbpf present in a distro, when building with # LIBBPF_DYNAMIC=1. # # - Fix errno setting races with event_fd and the signal handler in 'perf # record'. # # - Fix Power10 hv-24x7 metric events when some events may have a zero # count based on system configuration. # # - Do not fail Intel-PT misc test w/o libpython, just skip it. # # - Fix incorrect arm64 Hisi hip08 L3 metrics (IF_BP_MISP_BR_RET, # IF_BP_MISP_BR_RET, IF_BP_MISP_BR_BL) due to mistakes in the # documentation used to generate the JSON files for these metrics. # # - Fix auxtrace (Intel PT, ARM Coresight) address filter symbol name # match for modules, we need to skip the module name. # # - Sync copies of files with the kernel sources, including ppc syscall # tables and assorted headers, some resulting in tools being able to # decode new network protocols (IPPROTO_L2TP) and statx masks # (STATX_DIOALIGN). # # - Fix PMU name pai_crypto in the vendor events file (JSON) for s390. # # - Fix man page build wrt perf-arm-coresight.txt as the build process # assumes files starting with 'perf-' are man pages, and this file # isn't one. # # * tag 'perf-tools-fixes-for-v6.1-2022-10-26' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf vendor events arm64: Fix incorrect Hisi hip08 L3 metrics # perf auxtrace: Fix address filter symbol name match for modules # tools headers UAPI: Sync linux/perf_event.h with the kernel sources # tools headers cpufeatures: Sync with the kernel sources # tools headers uapi: Sync linux/stat.h with the kernel sources # tools include UAPI: Sync sound/asound.h copy with the kernel sources # tools headers uapi: Update linux/in.h copy # tools headers: Update the copy of x86's memcpy_64.S used in 'perf bench' # tools headers arm64: Sync arm64's cputype.h with the kernel sources # perf test: Do not fail Intel-PT misc test w/o libpython # perf list: Fix PMU name pai_crypto in perf list on s390 # perf record: Fix event fd races # perf bpf: Fix build with libbpf 0.7.0 by checking if bpf_program__set_insns() is available # perf bpf: Fix build with libbpf 0.7.0 by adding prototype for bpf_load_program() # perf vendor events power10: Fix hv-24x7 metric events # perf docs: Fix man page build wrt perf-arm-coresight.txt # tools headers UAPI: Sync powerpc syscall tables with the kernel sources # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 b229b6ca5abbd63ff40c1396095b1b36b18139c3 # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:596, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:31: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:9: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:9: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:34: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: arch/sh/kernel/cpu/sh2/setup-sh7619.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh/kernel/cpu/sh2] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh/kernel/cpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh/kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh] Error 2 make[2]: *** Waiting for unfinished jobs.... {standard input}: Assembler messages: {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:2305: Error: unknown pseudo-op: `.l' {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive {standard input}:2213: Error: displacement to undefined symbol .L382 overflows 8-bit field {standard input}:2286: Error: displacement to undefined symbol .L377 overflows 12-bit field {standard input}:2302: Error: displacement to undefined symbol .L378 overflows 8-bit field {standard input}:2204: Error: pcrel too far {standard input}:2206: Error: pcrel too far {standard input}:2209: Error: pcrel too far {standard input}:2215: Error: pcrel too far {standard input}:2216: Error: pcrel too far {standard input}:2217: Error: pcrel too far {standard input}:2221: Error: pcrel too far {standard input}:2229: Error: pcrel too far {standard input}:2231: Error: pcrel too far {standard input}:2232: Error: pcrel too far {standard input}:2247: Error: pcrel too far {standard input}:2248: Error: pcrel too far {standard input}:2249: Error: pcrel too far {standard input}:2259: Error: pcrel too far {standard input}:2261: Error: pcrel too far {standard input}:2262: Error: pcrel too far {standard input}:2274: Error: pcrel too far {standard input}:2293: Error: pcrel too far sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source if appropriate. See for instructions. make[5]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/net/pcs/pcs-xpcs.o] Error 4 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/pcs] Error 2 make[4]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/highmem.h:12, from /kisskb/src/include/linux/bvec.h:10, from /kisskb/src/include/linux/skbuff.h:17, from /kisskb/src/include/net/net_namespace.h:43, from /kisskb/src/include/linux/netdevice.h:38, from /kisskb/src/drivers/staging/octeon/ethernet-mem.c:9: /kisskb/src/drivers/staging/octeon/ethernet-mem.c: In function 'cvm_oct_free_hw_memory': /kisskb/src/arch/sh/include/asm/io.h:239:34: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 239 | #define phys_to_virt(address) ((void *)(address)) | ^ /kisskb/src/drivers/staging/octeon/ethernet-mem.c:123:39: note: in expansion of macro 'phys_to_virt' 123 | fpa = (char *)phys_to_virt(cvmx_ptr_to_phys(fpa)); | ^~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/staging/octeon/ethernet-mem.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/staging/octeon] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net] Error 2 make[3]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/staging] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:1992: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-allmodconfig_sh4-gcc11 # Build took: 0:02:59.130347