From: Michael Ellerman <mpe@ellerman.id.au>
To: linuxppc-dev@ozlabs.org
Cc: cai@lca.pw, kvm-ppc@vger.kernel.org
Subject: [PATCH 4/4] powerpc/kvm: Add ifdefs around template code
Date: Wed, 11 Sep 2019 21:57:46 +1000 [thread overview]
Message-ID: <20190911115746.12433-4-mpe@ellerman.id.au> (raw)
In-Reply-To: <20190911115746.12433-1-mpe@ellerman.id.au>
Some of the templates used for KVM patching are only used on certain
platforms, but currently they are always built-in, fix that.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/kernel/kvm_emul.S | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/powerpc/kernel/kvm_emul.S b/arch/powerpc/kernel/kvm_emul.S
index 9dd17dce10a1..7af6f8b50c5d 100644
--- a/arch/powerpc/kernel/kvm_emul.S
+++ b/arch/powerpc/kernel/kvm_emul.S
@@ -192,6 +192,8 @@
kvm_emulate_mtmsr_len:
.long (kvm_emulate_mtmsr_end - kvm_emulate_mtmsr) / 4
+#ifdef CONFIG_BOOKE
+
/* also used for wrteei 1 */
.global kvm_emulate_wrtee
kvm_emulate_wrtee:
@@ -285,6 +287,10 @@
kvm_emulate_wrteei_0_len:
.long (kvm_emulate_wrteei_0_end - kvm_emulate_wrteei_0) / 4
+#endif /* CONFIG_BOOKE */
+
+#ifdef CONFIG_PPC_BOOK3S_32
+
.global kvm_emulate_mtsrin
kvm_emulate_mtsrin:
@@ -334,6 +340,8 @@
kvm_emulate_mtsrin_len:
.long (kvm_emulate_mtsrin_end - kvm_emulate_mtsrin) / 4
+#endif /* CONFIG_PPC_BOOK3S_32 */
+
.balign 4
.global kvm_tmp
kvm_tmp:
--
2.21.0
next prev parent reply other threads:[~2019-09-11 12:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 11:57 [PATCH 1/4] powerpc/kvm: Move kvm_tmp into .text, shrink to 64K Michael Ellerman
2019-09-11 11:57 ` [PATCH 2/4] powerpc/64s: Remove overlaps_kvm_tmp() Michael Ellerman
2019-09-11 11:57 ` [PATCH 3/4] powerpc/kvm: Explicitly mark kvm guest code as __init Michael Ellerman
2019-09-11 11:57 ` Michael Ellerman [this message]
2019-09-19 10:25 ` [PATCH 1/4] powerpc/kvm: Move kvm_tmp into .text, shrink to 64K Michael Ellerman
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=20190911115746.12433-4-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=cai@lca.pw \
--cc=kvm-ppc@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
/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;
as well as URLs for NNTP newsgroup(s).