# git rev-parse -q --verify 5814bc2d4cc241c1a603fac2b5bf1bd4daa108fc^{commit} 5814bc2d4cc241c1a603fac2b5bf1bd4daa108fc already have revision, skipping fetch # git checkout -q -f -B kisskb 5814bc2d4cc241c1a603fac2b5bf1bd4daa108fc # git clean -qxdf # < git log -1 # commit 5814bc2d4cc241c1a603fac2b5bf1bd4daa108fc # Merge: 42dc45e84452 5149303fdfe5 # Author: Linus Torvalds # Date: Fri Dec 25 11:07:34 2020 -0800 # # Merge tag 'perf-tools-2020-12-24' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull more perf tools updates from Arnaldo Carvalho de Melo: # # - Refactor 'perf stat' per CPU/socket/die/thread aggregation fixing use # cases in ARM machines. # # - Fix memory leak when synthesizing SDT probes in 'perf probe'. # # - Update kernel header copies related to KVM, epol_pwait. msr-index and # powerpc and s390 syscall tables. # # * tag 'perf-tools-2020-12-24' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (24 commits) # perf probe: Fix memory leak when synthesizing SDT probes # perf stat aggregation: Add separate thread member # perf stat aggregation: Add separate core member # perf stat aggregation: Add separate die member # perf stat aggregation: Add separate socket member # perf stat aggregation: Add separate node member # perf stat aggregation: Start using cpu_aggr_id in map # perf cpumap: Drop in cpu_aggr_map struct # perf cpumap: Add new map type for aggregation # perf stat: Replace aggregation ID with a struct # perf cpumap: Add new struct for cpu aggregation # perf cpumap: Use existing allocator to avoid using malloc # perf tests: Improve topology test to check all aggregation types # perf tools: Update s390's syscall.tbl copy from the kernel sources # perf tools: Update powerpc's syscall.tbl copy from the kernel sources # perf s390: Move syscall.tbl check into check-headers.sh # perf powerpc: Move syscall.tbl check to check-headers.sh # tools headers UAPI: Synch KVM's svm.h header with the kernel # tools kvm headers: Update KVM headers from the kernel sources # tools headers UAPI: Sync KVM's vmx.h header with the kernel sources # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 5814bc2d4cc241c1a603fac2b5bf1bd4daa108fc # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7770_generic_defconfig # < make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:279: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:117: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1205: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 # Build took: 0:00:03.620555