]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/64: Fix build failure with allyesconfig in book3s_64_entry.S
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Sun, 27 Mar 2022 07:32:26 +0000 (09:32 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 28 Mar 2022 10:22:19 +0000 (21:22 +1100)
commit04b5d5ce001f5e700c4a0af7bafe57ecfa30cb7c
treef28aad48bacdb21f1a210d6408efd984a67a2eb0
parent18426352dda228458cb638f19b5ea3afaee9a4fe
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: 7b713de80eec ("KVM: PPC: Book3S HV P9: Implement the rest of the P9 path in C")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Avoid odd-looking bne ., use named local labels]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/89cf27bf43ee07a0b2879b9e8e2f5cd6386a3645.1648366338.git.christophe.leroy@csgroup.eu
arch/powerpc/kvm/book3s_64_entry.S