From: Marc Zyngier <marc.zyngier@arm.com>
To: c.dall@virtualopensystems.com
Cc: kvm@vger.kernel.org, android-virt@lists.cs.columbia.edu
Subject: [PATCH RFC v2 2/3] ARM: KVM: mark the end of the HYP mode code with __kvm_hyp_code_end
Date: Fri, 10 Feb 2012 22:22:13 +0000 [thread overview]
Message-ID: <1328912534-28888-2-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1328912534-28888-1-git-send-email-marc.zyngier@arm.com>
Use __kvm_hyp_code_end to mark the end of the main HYP code instead of
__kvm_vcpu_run_end. It's a bit cleaner as we're about to add more code
to that section.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
arch/arm/include/asm/kvm_asm.h | 3 ++-
arch/arm/kvm/arm.c | 4 ++--
arch/arm/kvm/interrupts.S | 8 +++++---
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h
index 89c318ea..5ee7bd3 100644
--- a/arch/arm/include/asm/kvm_asm.h
+++ b/arch/arm/include/asm/kvm_asm.h
@@ -45,7 +45,8 @@ extern char __kvm_hyp_vector[];
extern char __kvm_hyp_vector_end[];
extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);
-extern char __kvm_vcpu_run_end[];
+
+extern char __kvm_hyp_code_end[];
#endif
#endif /* __ARM_KVM_ASM_H__ */
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 14ccc4d..602e087 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -636,9 +636,9 @@ static int init_hyp_mode(void)
* Map the world-switch code
*/
err = create_hyp_mappings(kvm_hyp_pgd,
- __kvm_vcpu_run, __kvm_vcpu_run_end);
+ __kvm_vcpu_run, __kvm_hyp_code_end);
if (err) {
- kvm_err(err, "Cannot map world-switch code");
+ kvm_err(err, "Cannot map hyp mode code");
goto out_free_mappings;
}
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index fbc26ca..8b7e5e9 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -351,11 +351,13 @@ return_to_ioctl:
THUMB( orr lr, lr, #1)
mov pc, lr
- .ltorg
-__kvm_vcpu_run_end:
- .globl __kvm_vcpu_run_end
+
+ .ltorg
+__kvm_hyp_code_end:
+ .globl __kvm_hyp_code_end
+
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@ Hypervisor exception vector and handlers
--
1.7.3.4
next prev parent reply other threads:[~2012-02-10 22:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 22:22 [PATCH RFC v2 1/3] KVM: Guard mmu_notifier specific code with CONFIG_MMU_NOTIFIER Marc Zyngier
2012-02-10 22:22 ` Marc Zyngier [this message]
2012-02-10 22:32 ` [PATCH RFC v2 2/3] ARM: KVM: mark the end of the HYP mode code with __kvm_hyp_code_end Christoffer Dall
2012-02-10 22:22 ` [PATCH RFC v2 3/3] ARM: KVM: Add support for MMU notifiers Marc Zyngier
2012-02-10 22:49 ` Christoffer Dall
2012-02-11 15:00 ` [Android-virt] " Antonios Motakis
2012-02-11 17:35 ` Christoffer Dall
2012-02-11 18:33 ` Antonios Motakis
2012-02-12 1:12 ` Christoffer Dall
2012-02-12 8:20 ` Alexander Graf
2012-02-13 13:13 ` Marc Zyngier
2012-02-13 14:50 ` Christoffer Dall
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=1328912534-28888-2-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=android-virt@lists.cs.columbia.edu \
--cc=c.dall@virtualopensystems.com \
--cc=kvm@vger.kernel.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