Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2563a70c authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

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: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9fea59bd

arch/powerpc/include/asm/exception-64s.h

+0 −8
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Diff line number Diff line
@@ -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