# 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 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_44x_iss476-smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 44x/iss476-smp_defconfig WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] # < make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_44x_iss476-smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_44x_iss476-smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] WARNING: unmet direct dependencies detected for HOTPLUG_CPU Depends on [n]: SMP [=y] && (PPC_PSERIES [=n] || PPC_PMAC [=n] || PPC_POWERNV [=n] || FSL_SOC_BOOKE [=n]) Selected by [y]: - PM_SLEEP_SMP [=y] && SMP [=y] && (ARCH_SUSPEND_POSSIBLE [=y] || ARCH_HIBERNATION_POSSIBLE [=y]) && PM_SLEEP [=y] # make -s -j 24 ARCH=powerpc O=/kisskb/build/powerpc-merge_44x_iss476-smp_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/net/core/filter.c: In function '_bpf_setsockopt': /kisskb/src/net/core/filter.c:4291:6: warning: unused variable 'ifindex' [-Wunused-variable] int ifindex; ^ /kisskb/src/net/core/filter.c:4290:14: warning: unused variable 'net' [-Wunused-variable] struct net *net; ^ /kisskb/src/net/core/filter.c:4289:7: warning: unused variable 'devname' [-Wunused-variable] char devname[IFNAMSIZ]; ^ INFO: Uncompressed kernel (size 0x65ed08) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) INFO: Uncompressed kernel (size 0x65ed08) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x700000) Completed OK # rm -rf /kisskb/build/powerpc-merge_44x_iss476-smp_defconfig_powerpc-gcc5 # Build took: 0:01:03.457898