From: Alexander Graf <agraf@suse.de>
To: kvm-ppc@vger.kernel.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 5/6] KVM: PPC: Book3S PR: Fix ABIv2 on LE
Date: Tue, 8 Jul 2014 12:04:45 +0200 [thread overview]
Message-ID: <1404813886-14908-6-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1404813886-14908-1-git-send-email-agraf@suse.de>
We switched to ABIv2 on Little Endian systems now which gets rid of the
dotted function names. Branch to the actual functions when we see such
a system.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/kvm/book3s_interrupts.S | 4 ++++
arch/powerpc/kvm/book3s_rmhandlers.S | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/arch/powerpc/kvm/book3s_interrupts.S b/arch/powerpc/kvm/book3s_interrupts.S
index e2c29e3..d044b8b 100644
--- a/arch/powerpc/kvm/book3s_interrupts.S
+++ b/arch/powerpc/kvm/book3s_interrupts.S
@@ -25,7 +25,11 @@
#include <asm/exception-64s.h>
#if defined(CONFIG_PPC_BOOK3S_64)
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+#define FUNC(name) name
+#else
#define FUNC(name) GLUE(.,name)
+#endif
#define GET_SHADOW_VCPU(reg) addi reg, r13, PACA_SVCPU
#elif defined(CONFIG_PPC_BOOK3S_32)
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index 4850a22..16c4d88 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -36,7 +36,11 @@
#if defined(CONFIG_PPC_BOOK3S_64)
+#if defined(_CALL_ELF) && _CALL_ELF == 2
+#define FUNC(name) name
+#else
#define FUNC(name) GLUE(.,name)
+#endif
#elif defined(CONFIG_PPC_BOOK3S_32)
--
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 ` [PULL 4/6] KVM: PPC: Assembly functions exported to modules need _GLOBAL_TOC() Alexander Graf
2014-07-08 10:04 ` Alexander Graf [this message]
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-6-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--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