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>
This commit is contained in:
parent
9fea59bd7c
commit
2563a70c3b
|
@ -256,11 +256,6 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
|
||||||
ld r9,area+EX_R9(r13); \
|
ld r9,area+EX_R9(r13); \
|
||||||
bctr
|
bctr
|
||||||
|
|
||||||
#define BRANCH_TO_KVM(reg, label) \
|
|
||||||
__LOAD_FAR_HANDLER(reg, label); \
|
|
||||||
mtctr reg; \
|
|
||||||
bctr
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#define BRANCH_TO_COMMON(reg, label) \
|
#define BRANCH_TO_COMMON(reg, label) \
|
||||||
b label
|
b label
|
||||||
|
@ -268,9 +263,6 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
|
||||||
#define BRANCH_LINK_TO_FAR(reg, label) \
|
#define BRANCH_LINK_TO_FAR(reg, label) \
|
||||||
bl label
|
bl label
|
||||||
|
|
||||||
#define BRANCH_TO_KVM(reg, label) \
|
|
||||||
b label
|
|
||||||
|
|
||||||
#define __BRANCH_TO_KVM_EXIT(area, label) \
|
#define __BRANCH_TO_KVM_EXIT(area, label) \
|
||||||
ld r9,area+EX_R9(r13); \
|
ld r9,area+EX_R9(r13); \
|
||||||
b label
|
b label
|
||||||
|
|
|
@ -142,7 +142,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300)
|
||||||
lbz r0,HSTATE_HWTHREAD_REQ(r13)
|
lbz r0,HSTATE_HWTHREAD_REQ(r13)
|
||||||
cmpwi r0,0
|
cmpwi r0,0
|
||||||
beq 1f
|
beq 1f
|
||||||
BRANCH_TO_KVM(r10, kvm_start_guest)
|
b kvm_start_guest
|
||||||
1:
|
1:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue