summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2017-04-19 23:05:43 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2017-04-23 17:26:35 +1000
commit2563a70c3b2acc4f60083e2aaf1102f8dba73649 (patch)
treefc1a2e8778d9b96504ae454fa80a4bec2df090b0 /arch/powerpc/kernel
parent9fea59bd7ca541e5d0851f0b6dbca83c60ea90cd (diff)
downloadlinux-next-2563a70c3b2acc4f60083e2aaf1102f8dba73649.tar.gz
powerpc/64s: Remove unnecessary relocation branch from idle handler
The system reset idle handler system_reset_idle_common is relocated, so relocation is not required to branch to kvm_start_guest. The superfluous relocation does not result in incorrect code, but it does not compile outside of exception-64s.S (with fixed section definitions). Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/exceptions-64s.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 857bf7c5b946..7d496ee984fe 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -142,7 +142,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)
lbz r0,HSTATE_HWTHREAD_REQ(r13)
cmpwi r0,0
beq 1f
- BRANCH_TO_KVM(r10, kvm_start_guest)
+ b kvm_start_guest
1:
#endif