KVM: PPC: Assembly functions exported to modules need _GLOBAL_TOC()
authorAnton Blanchard <anton@samba.org>
Thu, 12 Jun 2014 08:16:53 +0000 (18:16 +1000)
committerAlexander Graf <agraf@suse.de>
Mon, 7 Jul 2014 10:02:32 +0000 (12:02 +0200)
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>
arch/powerpc/kvm/book3s_hv_rmhandlers.S
arch/powerpc/kvm/book3s_rmhandlers.S

index 77356fd25ccc96a8b4fd17746ea08edc0da16060..8d9c5d21179d2a91d241f90eb49324a0761a0dc5 100644 (file)
@@ -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)
index 9eec675220e621e029eac8ecf2a5dabfff17df5a..4850a224e5bf230726ffb20bfa8c34aba5530d19 100644 (file)
@@ -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)