# git rev-parse -q --verify a638349bf6c29433b938141f99225b160551ff48^{commit} a638349bf6c29433b938141f99225b160551ff48 already have revision, skipping fetch # git checkout -q -f -B kisskb a638349bf6c29433b938141f99225b160551ff48 # git clean -qxdf # git log -1 commit a638349bf6c29433b938141f99225b160551ff48 Merge: 085bec8 abee210 Author: Linus Torvalds Date: Mon Dec 11 17:13:03 2017 -0800 Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu Pull percpu fix from Tejun Heo: "Just one patch to work around CRIS boot problem caused by a recent change which freed a temporary boot data structure. The root cause is on CRIS side but it doesn't seem trivial to fix. For now, work around by skipping freeing on CRIS" * 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: hack to let the CRIS architecture to boot until they clean up # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < git log --format=%s --max-count=1 a638349bf6c29433b938141f99225b160551ff48 # < make -j 8 ARCH=um O=/home/kisskb/slave/build/linus_um-defconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 defconfig # make -j 8 ARCH=um O=/home/kisskb/slave/build/linus_um-defconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 make[1]: Entering directory '/home/kisskb/slave/build/linus_um-defconfig_um-x86_64' GEN ./Makefile scripts/kconfig/conf --silentoldconfig arch/x86/um/Kconfig CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h HOSTCC scripts/basic/bin2c CHK include/config/kernel.release GEN ./Makefile WRAP arch/um/include/generated/asm/barrier.h WRAP arch/um/include/generated/asm/bug.h WRAP arch/um/include/generated/asm/clkdev.h WRAP arch/um/include/generated/asm/current.h WRAP arch/um/include/generated/asm/delay.h WRAP arch/um/include/generated/asm/device.h WRAP arch/um/include/generated/asm/emergency-restart.h WRAP arch/um/include/generated/asm/exec.h WRAP arch/um/include/generated/asm/extable.h WRAP arch/um/include/generated/asm/ftrace.h WRAP arch/um/include/generated/asm/futex.h WRAP arch/um/include/generated/asm/hardirq.h WRAP arch/um/include/generated/asm/hw_irq.h WRAP arch/um/include/generated/asm/io.h WRAP arch/um/include/generated/asm/irq_regs.h WRAP arch/um/include/generated/asm/irq_work.h WRAP arch/um/include/generated/asm/kdebug.h WRAP arch/um/include/generated/asm/mcs_spinlock.h WRAP arch/um/include/generated/asm/mm-arch-hooks.h WRAP arch/um/include/generated/asm/param.h WRAP arch/um/include/generated/asm/pci.h WRAP arch/um/include/generated/asm/percpu.h WRAP arch/um/include/generated/asm/preempt.h WRAP arch/um/include/generated/asm/switch_to.h WRAP arch/um/include/generated/asm/topology.h WRAP arch/um/include/generated/asm/trace_clock.h WRAP arch/um/include/generated/asm/word-at-a-time.h WRAP arch/um/include/generated/asm/xor.h WRAP arch/um/include/generated/asm/kprobes.h UPD include/config/kernel.release Using /home/kisskb/slave/src as source for kernel CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h CC scripts/mod/empty.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/kallsyms CC scripts/mod/devicetable-offsets.s HOSTCC scripts/asn1_compiler HOSTCC scripts/extract-cert MKELF scripts/mod/elfconfig.h CHK scripts/mod/devicetable-offsets.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/sumversion.o UPD scripts/mod/devicetable-offsets.h HOSTCC scripts/mod/file2alias.o SYSTBL arch/x86/include/generated/asm/syscalls_32.h SYSHDR arch/x86/include/generated/asm/unistd_32_ia32.h SYSHDR arch/x86/include/generated/asm/unistd_64_x32.h SYSTBL arch/x86/include/generated/asm/syscalls_64.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_32.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_64.h SYSHDR arch/x86/include/generated/uapi/asm/unistd_x32.h HOSTLD scripts/mod/modpost HOSTCC scripts/unifdef CC arch/x86/um/user-offsets.s CHK include/generated/user_constants.h UPD include/generated/user_constants.h CC kernel/bounds.s CHK include/generated/timeconst.h UPD include/generated/timeconst.h CHK include/generated/bounds.h UPD include/generated/bounds.h CC arch/um/kernel/asm-offsets.s CHK include/generated/asm-offsets.h UPD include/generated/asm-offsets.h CALL /home/kisskb/slave/src/scripts/checksyscalls.sh CC init/main.o CHK include/generated/compile.h CC init/do_mounts.o CC init/noinitramfs.o CC init/calibrate.o CC init/init_task.o AR usr/built-in.o QUOTE arch/um/kernel/config.tmp UPD include/generated/compile.h CC arch/um/kernel/exec.o CC arch/um/drivers/stdio_console.o CC arch/um/os-Linux/aio.o CC init/version.o CC arch/um/os-Linux/execvp.o CC arch/um/os-Linux/file.o In file included from /home/kisskb/slave/src/include/linux/perf_event.h:18:0, from /home/kisskb/slave/src/include/linux/trace_events.h:10, from /home/kisskb/slave/src/include/trace/syscall.h:7, from /home/kisskb/slave/src/include/linux/syscalls.h:82, from /home/kisskb/slave/src/init/noinitramfs.c:23: /home/kisskb/slave/src/include/uapi/linux/bpf_perf_event.h:11:32: fatal error: asm/bpf_perf_event.h: No such file or directory compilation terminated. CC arch/um/drivers/fd.o In file included from /home/kisskb/slave/src/include/linux/perf_event.h:18:0, from /home/kisskb/slave/src/include/linux/trace_events.h:10, from /home/kisskb/slave/src/include/trace/syscall.h:7, from /home/kisskb/slave/src/include/linux/syscalls.h:82, from /home/kisskb/slave/src/init/main.c:20: /home/kisskb/slave/src/include/uapi/linux/bpf_perf_event.h:11:32: fatal error: asm/bpf_perf_event.h: No such file or directory compilation terminated. /home/kisskb/slave/src/scripts/Makefile.build:310: recipe for target 'init/noinitramfs.o' failed make[2]: *** [init/noinitramfs.o] Error 1 make[2]: *** Waiting for unfinished jobs.... CC arch/um/drivers/chan_kern.o /home/kisskb/slave/src/scripts/Makefile.build:310: recipe for target 'init/main.o' failed make[2]: *** [init/main.o] Error 1 AR arch/x86/crypto/built-in.o CC arch/x86/um/bugs_64.o CC arch/x86/um/delay.o CC arch/um/kernel/exitcode.o CC arch/um/kernel/irq.o CC kernel/fork.o CC arch/um/kernel/ksyms.o CC arch/x86/um/fault.o CC arch/x86/um/ldt.o CC arch/um/os-Linux/helper.o CC arch/um/os-Linux/irq.o In file included from /home/kisskb/slave/src/include/linux/perf_event.h:18:0, from /home/kisskb/slave/src/include/linux/trace_events.h:10, from /home/kisskb/slave/src/include/trace/syscall.h:7, from /home/kisskb/slave/src/include/linux/syscalls.h:82, from /home/kisskb/slave/src/init/do_mounts.h:5, from /home/kisskb/slave/src/init/do_mounts.c:36: /home/kisskb/slave/src/include/uapi/linux/bpf_perf_event.h:11:32: fatal error: asm/bpf_perf_event.h: No such file or directory compilation terminated. /home/kisskb/slave/src/scripts/Makefile.build:310: recipe for target 'init/do_mounts.o' failed make[2]: *** [init/do_mounts.o] Error 1 /home/kisskb/slave/src/Makefile:1012: recipe for target 'init' failed make[1]: *** [init] Error 2 make[1]: *** Waiting for unfinished jobs.... CC arch/um/os-Linux/main.o CC arch/x86/um/ptrace_64.o CC arch/x86/um/ptrace_user.o AS arch/x86/um/setjmp_64.o CC arch/x86/um/signal.o CC arch/um/os-Linux/mem.o CC arch/um/os-Linux/process.o In file included from /home/kisskb/slave/src/include/linux/perf_event.h:18:0, from /home/kisskb/slave/src/include/linux/trace_events.h:10, from /home/kisskb/slave/src/include/trace/syscall.h:7, from /home/kisskb/slave/src/include/linux/syscalls.h:82, from /home/kisskb/slave/src/arch/x86/um/ldt.c:9: /home/kisskb/slave/src/include/uapi/linux/bpf_perf_event.h:11:32: fatal error: asm/bpf_perf_event.h: No such file or directory compilation terminated. In file included from /home/kisskb/slave/src/include/linux/perf_event.h:18:0, from /home/kisskb/slave/src/include/linux/trace_events.h:10, from /home/kisskb/slave/src/include/trace/syscall.h:7, from /home/kisskb/slave/src/include/linux/syscalls.h:82, from /home/kisskb/slave/src/kernel/fork.c:52: /home/kisskb/slave/src/include/uapi/linux/bpf_perf_event.h:11:32: fatal error: asm/bpf_perf_event.h: No such file or directory compilation terminated. /home/kisskb/slave/src/scripts/Makefile.build:310: recipe for target 'kernel/fork.o' failed make[2]: *** [kernel/fork.o] Error 1 /home/kisskb/slave/src/Makefile:1012: recipe for target 'kernel' failed make[1]: *** [kernel] Error 2 CC arch/um/drivers/chan_user.o /home/kisskb/slave/src/scripts/Makefile.build:310: recipe for target 'arch/x86/um/ldt.o' failed make[2]: *** [arch/x86/um/ldt.o] Error 1 make[2]: *** Waiting for unfinished jobs.... CC arch/um/kernel/mem.o CC arch/um/drivers/line.o CC arch/um/kernel/physmem.o CC arch/um/kernel/process.o CC arch/um/os-Linux/registers.o CC arch/um/kernel/ptrace.o CC arch/um/os-Linux/sigio.o CC arch/um/kernel/reboot.o /home/kisskb/slave/src/Makefile:1012: recipe for target 'arch/x86/um' failed make[1]: *** [arch/x86/um] Error 2 CC arch/um/os-Linux/signal.o CC arch/um/kernel/sigio.o CC arch/um/drivers/ssl.o CC arch/um/os-Linux/start_up.o CC arch/um/drivers/stderr_console.o CC arch/um/drivers/slip_kern.o CC arch/um/os-Linux/time.o CC arch/um/os-Linux/tty.o CC arch/um/kernel/signal.o CC arch/um/kernel/syscall.o CC arch/um/kernel/sysrq.o CC arch/um/kernel/time.o CC arch/um/os-Linux/umid.o CC arch/um/os-Linux/user_syms.o CC arch/um/kernel/tlb.o CC arch/um/os-Linux/util.o CC arch/um/drivers/slip_user.o In file included from /home/kisskb/slave/src/include/linux/perf_event.h:18:0, from /home/kisskb/slave/src/include/linux/trace_events.h:10, from /home/kisskb/slave/src/include/trace/syscall.h:7, from /home/kisskb/slave/src/include/linux/syscalls.h:82, from /home/kisskb/slave/src/arch/um/kernel/syscall.c:11: /home/kisskb/slave/src/include/uapi/linux/bpf_perf_event.h:11:32: fatal error: asm/bpf_perf_event.h: No such file or directory compilation terminated. /home/kisskb/slave/src/scripts/Makefile.build:310: recipe for target 'arch/um/kernel/syscall.o' failed make[2]: *** [arch/um/kernel/syscall.o] Error 1 make[2]: *** Waiting for unfinished jobs.... CC arch/um/drivers/slip_common.o CC arch/um/os-Linux/drivers/ethertap_kern.o CC arch/um/os-Linux/drivers/ethertap_user.o CC arch/um/os-Linux/drivers/tuntap_kern.o CC arch/um/os-Linux/skas/mem.o CC arch/um/drivers/slirp_kern.o CC arch/um/os-Linux/skas/process.o /home/kisskb/slave/src/arch/um/os-Linux/skas/process.c: In function 'start_idle_thread': /home/kisskb/slave/src/arch/um/os-Linux/skas/process.c:613:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ CC arch/um/drivers/slirp_user.o CC arch/um/os-Linux/drivers/tuntap_user.o CC arch/um/drivers/daemon_kern.o CC arch/um/drivers/daemon_user.o AR arch/um/os-Linux/skas/built-in.o CC arch/um/drivers/umcast_kern.o CC arch/um/drivers/umcast_user.o CC arch/um/drivers/net_kern.o /home/kisskb/slave/src/Makefile:1012: recipe for target 'arch/um/kernel' failed make[1]: *** [arch/um/kernel] Error 2 CC arch/um/drivers/net_user.o CC arch/um/drivers/mconsole_kern.o CC arch/um/drivers/mconsole_user.o AR arch/um/os-Linux/drivers/ethertap.o CC arch/um/drivers/ubd_kern.o AR arch/um/os-Linux/drivers/tuntap.o AR arch/um/os-Linux/drivers/built-in.o AR arch/um/os-Linux/built-in.o CC arch/um/drivers/ubd_user.o CC arch/um/drivers/null.o CC arch/um/drivers/port_kern.o CC arch/um/drivers/port_user.o CC arch/um/drivers/pty.o CC arch/um/drivers/tty.o In file included from /home/kisskb/slave/src/include/linux/perf_event.h:18:0, from /home/kisskb/slave/src/include/linux/trace_events.h:10, from /home/kisskb/slave/src/include/trace/syscall.h:7, from /home/kisskb/slave/src/include/linux/syscalls.h:82, from /home/kisskb/slave/src/arch/um/drivers/mconsole_kern.c:19: /home/kisskb/slave/src/include/uapi/linux/bpf_perf_event.h:11:32: fatal error: asm/bpf_perf_event.h: No such file or directory compilation terminated. /home/kisskb/slave/src/scripts/Makefile.build:310: recipe for target 'arch/um/drivers/mconsole_kern.o' failed make[2]: *** [arch/um/drivers/mconsole_kern.o] Error 1 make[2]: *** Waiting for unfinished jobs.... /home/kisskb/slave/src/Makefile:1012: recipe for target 'arch/um/drivers' failed make[1]: *** [arch/um/drivers] Error 2 make[1]: Leaving directory '/home/kisskb/slave/build/linus_um-defconfig_um-x86_64' Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 8 ARCH=um O=/home/kisskb/slave/build/linus_um-defconfig_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 /home/kisskb/slave/build/linus_um-defconfig_um-x86_64 # Build took: 0:00:08.035498