# git rev-parse -q --verify e2da783614bb8930aa89753d3c3cd53d5604665d^{commit} e2da783614bb8930aa89753d3c3cd53d5604665d already have revision, skipping fetch # git checkout -q -f -B kisskb e2da783614bb8930aa89753d3c3cd53d5604665d # git clean -qxdf # < git log -1 # commit e2da783614bb8930aa89753d3c3cd53d5604665d # Merge: a1339d6355ac 648b054a4647 # Author: Linus Torvalds # Date: Sun Jan 17 13:14:46 2021 -0800 # # Merge tag 'perf-tools-fixes-2021-01-17' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tools fixes from Arnaldo Carvalho de Melo: # # - Fix 'CPU too large' error in Intel PT # # - Correct event attribute sizes in 'perf inject' # # - Sync build_bug.h and kvm.h kernel copies # # - Fix bpf.h header include directive in 5sec.c 'perf trace' bpf example # # - libbpf tests fixes # # - Fix shadow stat 'perf test' for non-bash shells # # - Take cgroups into account for shadow stats in 'perf stat' # # * tag 'perf-tools-fixes-2021-01-17' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: # perf inject: Correct event attribute sizes # perf intel-pt: Fix 'CPU too large' error # perf stat: Take cgroups into account for shadow stats # perf stat: Introduce struct runtime_stat_data # libperf tests: Fail when failing to get a tracepoint id # libperf tests: If a test fails return non-zero # libperf tests: Avoid uninitialized variable warning # perf test: Fix shadow stat test for non-bash shells # tools headers: Syncronize linux/build_bug.h with the kernel sources # tools headers UAPI: Sync kvm.h headers with the kernel sources # perf bpf examples: Fix bpf.h header include directive in 5sec.c example # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux-ld --version # < git log --format=%s --max-count=1 e2da783614bb8930aa89753d3c3cd53d5604665d # < make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- defconfig arch/ia64/configs/generic_defconfig:58:warning: override: reassigning to symbol ATA arch/ia64/configs/generic_defconfig:59:warning: override: reassigning to symbol ATA_PIIX # < make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- help # make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- olddefconfig # make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included from /kisskb/src/arch/ia64/include/uapi/asm/intrinsics.h:22:0, from /kisskb/src/arch/ia64/include/asm/intrinsics.h:11, from /kisskb/src/arch/ia64/include/asm/timex.h:14, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:60, from /kisskb/src/fs/nfs/read.c:11: /kisskb/src/fs/nfs/read.c: In function 'nfs_read_completion': /kisskb/src/arch/ia64/include/uapi/asm/cmpxchg.h:57:2: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr)))) ^ /kisskb/src/fs/nfs/read.c:196:5: note: in expansion of macro 'xchg' xchg(&nfs_req_openctx(req)->error, error); ^ /kisskb/src/fs/nfs/read.c: In function 'nfs_readpage': /kisskb/src/arch/ia64/include/uapi/asm/cmpxchg.h:57:2: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr))) __xchg((unsigned long) (x), (ptr), sizeof(*(ptr)))) ^ /kisskb/src/fs/nfs/read.c:355:2: note: in expansion of macro 'xchg' xchg(&ctx->error, 0); ^ In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/async.h:13, from /kisskb/src/kernel/async.c:47: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/idr.h:15, from /kisskb/src/include/linux/kernfs.h:13, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/energy_model.h:7, from /kisskb/src/include/linux/device.h:16, from /kisskb/src/include/linux/async.h:14, from /kisskb/src/kernel/async.c:47: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:279: kernel/async.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1805: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/nodemask.h:96, from /kisskb/src/include/linux/mount.h:15, from /kisskb/src/fs/pnode.c:9: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/fs.h:15, from /kisskb/src/fs/pnode.c:10: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:279: fs/pnode.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1805: fs] Error 2 In file included from /kisskb/src/include/linux/numa.h:25:0, from /kisskb/src/include/linux/async.h:13, from /kisskb/src/drivers/acpi/battery.c:13: /kisskb/src/arch/ia64/include/asm/sparsemem.h:14:40: warning: "PAGE_SHIFT" is not defined [-Wundef] #if ((CONFIG_FORCE_MAX_ZONEORDER - 1 + PAGE_SHIFT) > SECTION_SIZE_BITS) ^ In file included from /kisskb/src/include/linux/gfp.h:6:0, from /kisskb/src/include/linux/xarray.h:14, from /kisskb/src/include/linux/radix-tree.h:19, from /kisskb/src/include/linux/idr.h:15, from /kisskb/src/include/linux/kernfs.h:13, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/energy_model.h:7, from /kisskb/src/include/linux/device.h:16, from /kisskb/src/include/linux/async.h:14, from /kisskb/src/drivers/acpi/battery.c:13: /kisskb/src/include/linux/mmzone.h:1156:2: error: #error Allocator MAX_ORDER exceeds SECTION_SIZE #error Allocator MAX_ORDER exceeds SECTION_SIZE ^ make[3]: *** [/kisskb/src/scripts/Makefile.build:279: drivers/acpi/battery.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:496: drivers/acpi] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1805: drivers] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 8 ARCH=ia64 O=/kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/ia64-linux/bin/ia64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_ia64-defconfig_ia64-gcc4.9 # Build took: 0:02:34.725334