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

Commit 6ed179b6 authored Jun 12, 2014 by Anton Blanchard Committed by Alexander Graf Jul 07, 2014

KVM: PPC: Assembly functions exported to modules need _GLOBAL_TOC()



Both kvmppc_hv_entry_trampoline and kvmppc_entry_trampoline are
assembly functions that are exported to modules and also require
a valid r2.

As such we need to use _GLOBAL_TOC so we provide a global entry
point that establishes the TOC (r2).

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Alexander Graf <agraf@suse.de>

parent 9715a2e8

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@
		*
		* LR = return address to continue at after eventually re-enabling MMU
		*/
		_GLOBAL(kvmppc_hv_entry_trampoline)
		_GLOBAL_TOC(kvmppc_hv_entry_trampoline)
		mflr r0
		std r0, PPC_LR_STKOFF(r1)
		stdu r1, -112(r1)

arch/powerpc/kvm/book3s_rmhandlers.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ kvmppc_handler_skip_ins:
		* On entry, r4 contains the guest shadow MSR
		* MSR.EE has to be 0 when calling this function
		*/
		_GLOBAL(kvmppc_entry_trampoline)
		_GLOBAL_TOC(kvmppc_entry_trampoline)
		mfmsr r5
		LOAD_REG_ADDR(r7, kvmppc_handler_trampoline_enter)
		toreal(r7)