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>

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index b89c91e27dd0efb3853823c681638ecf7858a670..437550175b4dbab6647863e77fcc1f1b592767f6 100644 (file)
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -256,11 +256,6 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
        ld      r9,area+EX_R9(r13);                                     \
        bctr
 
-#define BRANCH_TO_KVM(reg, label)                                      \
-       __LOAD_FAR_HANDLER(reg, label);                                 \
-       mtctr   reg;                                                    \
-       bctr
-
 #else
 #define BRANCH_TO_COMMON(reg, label)                                   \
        b       label
@@ -268,9 +263,6 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 #define BRANCH_LINK_TO_FAR(reg, label)                                 \
        bl      label
 
-#define BRANCH_TO_KVM(reg, label)                                      \
-       b       label
-
 #define __BRANCH_TO_KVM_EXIT(area, label)                              \
        ld      r9,area+EX_R9(r13);                                     \
        b       label

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 857bf7c5b9465aff743b3e62094cc47d808c8c92..7d496ee984fe497358847cb5a47b47c2be6f14c0 100644 (file)
--- 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