# git rev-parse -q --verify af41d2866f7d75bbb38d487f6ec7770425d70e45^{commit} af41d2866f7d75bbb38d487f6ec7770425d70e45 already have revision, skipping fetch # git checkout -q -f -B kisskb af41d2866f7d75bbb38d487f6ec7770425d70e45 # git clean -qxdf # < git log -1 # commit af41d2866f7d75bbb38d487f6ec7770425d70e45 # Author: Christophe Leroy # Date: Sun Mar 27 09:32:26 2022 +0200 # # powerpc/64: Fix build failure with allyesconfig in book3s_64_entry.S # # Using conditional branches between two files is hasardous, # they may get linked too far from each other. # # arch/powerpc/kvm/book3s_64_entry.o:(.text+0x3ec): relocation truncated # to fit: R_PPC64_REL14 (stub) against symbol `system_reset_common' # defined in .text section in arch/powerpc/kernel/head_64.o # # Reorganise the code to use non conditional branches. # # Fixes: 89d35b239101 ("KVM: PPC: Book3S HV P9: Implement the rest of the P9 path in C") # Signed-off-by: Christophe Leroy # [mpe: Avoid odd-looking bne ., use named local labels] # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/89cf27bf43ee07a0b2879b9e8e2f5cd6386a3645.1648366338.git.christophe.leroy@csgroup.eu # < /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 af41d2866f7d75bbb38d487f6ec7770425d70e45 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- powernv_defconfig # Added to kconfig CONFIG_RELOCATABLE=n # Added to kconfig CONFIG_STRICT_KERNEL_RWX=y # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4104:warning: override: reassigning to symbol RELOCATABLE # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- Completed OK # rm -rf /kisskb/build/powerpc-next_powernv_defconfig+STRICT_RWX_powerpc-gcc5 # Build took: 0:02:09.059195