# git rev-parse -q --verify ec7b8eb9bc7a519047485c95f7292b48f5b73fe6^{commit} ec7b8eb9bc7a519047485c95f7292b48f5b73fe6 already have revision, skipping fetch # git checkout -q -f -B kisskb ec7b8eb9bc7a519047485c95f7292b48f5b73fe6 # git clean -qxdf # < git log -1 # commit ec7b8eb9bc7a519047485c95f7292b48f5b73fe6 # Author: Jessica Yu # Date: Wed Apr 8 16:31:06 2020 +0200 # # module: break nested ARCH_HAS_STRICT_MODULE_RWX and STRICT_MODULE_RWX #ifdefs # # Various frob_* and module_{enable,disable}_* functions are defined in a # CONFIG_ARCH_HAS_STRICT_MODULE_RWX ifdef block which also has a nested # CONFIG_STRICT_MODULE_RWX ifdef block within it. This is unecessary and # makes things hard to read. Not only that, this construction requires # redundant empty stubs for module_enable_nx(). I suspect this was # originally done for cosmetic reasons - to keep all the frob_* functions # in the same place, and all the module_{enable,disable}_* functions right # after, but as a result it made the code harder to read. # # Make this more readable by unnesting the ifdef blocks and getting rid of # the redundant empty stubs. # # Signed-off-by: Jessica Yu # [mpe: Cherry-pick to fix build breakage] # Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 ec7b8eb9bc7a519047485c95f7292b48f5b73fe6 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_85xx_tqm8560_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 85xx/tqm8560_defconfig # < make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_85xx_tqm8560_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_85xx_tqm8560_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/powerpc-merge_85xx_tqm8560_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- INFO: Uncompressed kernel (size 0x52101c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) INFO: Uncompressed kernel (size 0x510920) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x600000) Image Name: Linux-5.7.0-27499-gec7b8eb9bc7a Created: Sat Jun 6 03:43:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2618443 Bytes = 2557.07 KiB = 2.50 MiB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-5.7.0-27499-gec7b8eb9bc7a Created: Sat Jun 6 03:43:32 2020 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 2648278 Bytes = 2586.21 KiB = 2.53 MiB Load Address: 00600000 Entry Point: 00600314 Completed OK # rm -rf /kisskb/build/powerpc-merge_85xx_tqm8560_defconfig_powerpc-gcc5 # Build took: 0:00:45.748400