# 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-4.9.4-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 ec7b8eb9bc7a519047485c95f7292b48f5b73fe6 # < make -s -j 24 ARCH=mips O=/kisskb/build/powerpc-merge_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- defconfig # < make -s -j 24 ARCH=mips O=/kisskb/build/powerpc-merge_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- help # make -s -j 24 ARCH=mips O=/kisskb/build/powerpc-merge_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- olddefconfig # make -s -j 24 ARCH=mips O=/kisskb/build/powerpc-merge_mips-defconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- FIT description: Linux 5.7.0-gec7b8eb9bc7a Created: Sat Jun 6 04:25:26 2020 Image 0 (kernel@0) Description: Linux 5.7.0-gec7b8eb9bc7a Created: Sat Jun 6 04:25:26 2020 Type: Kernel Image Compression: gzip compressed Data Size: 4987947 Bytes = 4871.04 KiB = 4.76 MiB Architecture: MIPS OS: Linux Load Address: 0x80100000 Entry Point: 0x809276e8 Hash algo: sha1 Hash value: 22a32997658510bf571e1b39efb97451a73af78f Image 1 (fdt@boston) Description: img,boston Device Tree Created: Sat Jun 6 04:25:26 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Sat Jun 6 04:25:26 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Sat Jun 6 04:25:26 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: be2724f58b66c316a61da7c11ced633f4e7e86c7 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Sat Jun 6 04:25:26 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5198 Bytes = 5.08 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 7556b1594bd7ab9e3b3fa939d8e3e03ae58fa180 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Sat Jun 6 04:25:26 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga Completed OK # rm -rf /kisskb/build/powerpc-merge_mips-defconfig_mips-gcc4.9 # Build took: 0:02:11.987671