From: Alexander Graf <agraf@suse.de>
To: kvm-ppc@vger.kernel.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Anton Blanchard <anton@samba.org>
Subject: [PULL 4/6] KVM: PPC: Assembly functions exported to modules need _GLOBAL_TOC()
Date: Tue, 8 Jul 2014 12:04:44 +0200 [thread overview]
Message-ID: <1404813886-14908-5-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1404813886-14908-1-git-send-email-agraf@suse.de>
From: Anton Blanchard <anton@samba.org>
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 | 2 +-
arch/powerpc/kvm/book3s_rmhandlers.S | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 77356fd..8d9c5d2 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -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)
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index 9eec675..4850a22 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -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)
--
1.8.1.4
next prev parent reply other threads:[~2014-07-08 10:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-08 10:04 [PULL 3.16 0/6] 3.16 patch queue 2014-07-08 Alexander Graf
2014-07-08 10:04 ` [PULL 1/6] KVM: PPC: Book3E: Unlock mmu_lock when setting caching atttribute Alexander Graf
2014-07-08 10:04 ` [PULL 2/6] KVM: PPC: BOOK3S: HV: Use base page size when comparing against slb value Alexander Graf
2014-07-08 10:04 ` [PULL 3/6] PPC: Add _GLOBAL_TOC for 32bit Alexander Graf
2014-07-08 10:04 ` Alexander Graf [this message]
2014-07-08 10:04 ` [PULL 5/6] KVM: PPC: Book3S PR: Fix ABIv2 on LE Alexander Graf
2014-07-08 10:04 ` [PULL 6/6] KVM: PPC: RTAS: Do byte swaps explicitly Alexander Graf
2014-07-08 10:13 ` [PULL 3.16 0/6] 3.16 patch queue 2014-07-08 Paolo Bonzini
2014-07-08 10:14 ` Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1404813886-14908-5-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=anton@samba.org \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox