# git rev-parse -q --verify 9fb4c5250f10dc4d8257cd766991be690eb25c5b^{commit} 9fb4c5250f10dc4d8257cd766991be690eb25c5b already have revision, skipping fetch # git checkout -q -f -B kisskb 9fb4c5250f10dc4d8257cd766991be690eb25c5b # git clean -qxdf # < git log -1 # commit 9fb4c5250f10dc4d8257cd766991be690eb25c5b # Merge: a789d5f8a99a f55d9895884b # Author: Linus Torvalds # Date: Thu Jun 4 11:13:03 2020 -0700 # # Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching # # Pull livepatching updates from Jiri Kosina: # # - simplifications and improvements for issues Peter Ziljstra found # during his previous work on W^X cleanups. # # This allows us to remove livepatch arch-specific .klp.arch sections # and add proper support for jump labels in patched code. # # Also, this patchset removes the last module_disable_ro() usage in the # tree. # # Patches from Josh Poimboeuf and Peter Zijlstra # # - a few other minor cleanups # # * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: # MAINTAINERS: add lib/livepatch to LIVE PATCHING # livepatch: add arch-specific headers to MAINTAINERS # livepatch: Make klp_apply_object_relocs static # MAINTAINERS: adjust to livepatch .klp.arch removal # module: Make module_enable_ro() static again # x86/module: Use text_mutex in apply_relocate_add() # module: Remove module_disable_ro() # livepatch: Remove module_disable_ro() usage # x86/module: Use text_poke() for late relocations # s390/module: Use s390_kernel_write() for late relocations # s390: Change s390_kernel_write() return type to match memcpy() # livepatch: Prevent module-specific KLP rela sections from referencing vmlinux symbols # livepatch: Remove .klp.arch # livepatch: Apply vmlinux-specific KLP relocations early # livepatch: Disallow vmlinux.ko # < /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 9fb4c5250f10dc4d8257cd766991be690eb25c5b # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7710voipgw_defconfig # < make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_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 :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh3/../../entry-common.S:388: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/kernel/module.c: In function 'do_init_module': /kisskb/src/kernel/module.c:3593:2: error: implicit declaration of function 'module_enable_ro' [-Werror=implicit-function-declaration] module_enable_ro(mod, true); ^ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:267: kernel/module.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1735: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:17: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type return ioread8(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread8(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:18: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type return ioread16(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread16(void __iomem *); ^ /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:18: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type return ioread32(addr); ^ In file included from /kisskb/src/arch/sh/include/asm/io.h:21:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/drivers/sh/clk/cpg.c:14: /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' extern unsigned int ioread32(void __iomem *); ^ make: *** [Makefile:180: sub-make] Error 2 Command 'make -s -j 10 ARCH=sh O=/kisskb/build/linus_sh7710voipgw_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_sh7710voipgw_defconfig_sh4-gcc4.9 # Build took: 0:01:04.140214