# 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/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 9fb4c5250f10dc4d8257cd766991be690eb25c5b # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig KCONFIG_SEED=0x54FC60 # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:5924:warning: override: reassigning to symbol STANDALONE .config:5926:warning: override: reassigning to symbol MODULE_SIG .config:5929:warning: override: reassigning to symbol PPC_DISABLE_WERROR .config:5930:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:5931:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD .config:5934:warning: override: reassigning to symbol LD_HEAD_STUB_CATCH # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /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[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1735: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/drivers/net/ethernet/aurora/nb8800.c:30:0: /kisskb/src/drivers/net/ethernet/aurora/nb8800.h:92:0: warning: "TCR_DIE" redefined #define TCR_DIE BIT(7) ^ In file included from /kisskb/src/arch/powerpc/include/asm/reg.h:21:0, from /kisskb/src/arch/powerpc/include/asm/processor.h:9, from /kisskb/src/arch/powerpc/include/asm/thread_info.h:40, from /kisskb/src/include/linux/thread_info.h:38, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/powerpc/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/module.h:13, from /kisskb/src/drivers/net/ethernet/aurora/nb8800.c:13: /kisskb/src/arch/powerpc/include/asm/reg_booke.h:551:0: note: this is the location of the previous definition #define TCR_DIE TCR_PIE /* DEC Interrupt Enable */ ^ /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c: In function 'qe_ep0_rx': /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:836:13: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] vaddr = (u32)phys_to_virt(in_be32(&bd->buf)); ^ In file included from /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:41:0: /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:837:28: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] frame_set_data(pframe, (u8 *)vaddr); ^ /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.h:229:47: note: in definition of macro 'frame_set_data' #define frame_set_data(frm, dat) (frm->data = dat) ^ /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c: In function 'ep_rx_tasklet': /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:964:13: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] vaddr = (u32)phys_to_virt(in_be32(&bd->buf)); ^ In file included from /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:41:0: /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:965:28: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] frame_set_data(pframe, (u8 *)vaddr); ^ /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.h:229:47: note: in definition of macro 'frame_set_data' #define frame_set_data(frm, dat) (frm->data = dat) ^ /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c: In function 'ep_req_rx': /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:1490:12: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] vaddr = (u32)phys_to_virt(in_be32(&bd->buf)); ^ In file included from /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:41:0: /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.c:1491:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] frame_set_data(pframe, (u8 *)vaddr); ^ /kisskb/src/drivers/usb/gadget/udc/fsl_qe_udc.h:229:47: note: in definition of macro 'frame_set_data' #define frame_set_data(frm, dat) (frm->data = dat) ^ make: *** [Makefile:180: sub-make] Error 2 Command 'make -s -j 24 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 # Build took: 0:06:21.604312