From: brian.starkey@arm.com (Brian Starkey)
To: linux-arm-kernel@lists.infradead.org
Subject: next-20160222 build: 5 failures 9 warnings (next-20160222)
Date: Mon, 22 Feb 2016 11:52:43 +0000 [thread overview]
Message-ID: <20160222115243.GA5779@e106950-lin.cambridge.arm.com> (raw)
In-Reply-To: <56CAE5E6.7030707@arm.com>
Hi Mark,
On Mon, Feb 22, 2016 at 10:41:42AM +0000, Marc Zyngier wrote:
>I'm about to push the following patch on top of the KVM tree:
>
>diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
>index 43688d9..31fe7d6 100644
>--- a/arch/arm64/include/asm/kvm_host.h
>+++ b/arch/arm64/include/asm/kvm_host.h
>@@ -333,11 +333,6 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr,
> hyp_stack_ptr, vector_ptr);
> }
>
>-static inline void __cpu_init_stage2(void)
>-{
>- kvm_call_hyp(__init_stage2_translation);
>-}
>-
> static inline void kvm_arch_hardware_disable(void) {}
> static inline void kvm_arch_hardware_unsetup(void) {}
> static inline void kvm_arch_sync_events(struct kvm *kvm) {}
>@@ -349,4 +344,11 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu);
> void kvm_arm_clear_debug(struct kvm_vcpu *vcpu);
> void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu);
>
>+/* #define kvm_call_hyp(f, ...) __kvm_call_hyp(kvm_ksym_ref(f), ##__VA_ARGS__) */
>+
>+static inline void __cpu_init_stage2(void)
>+{
>+ kvm_call_hyp(__init_stage2_translation);
>+}
>+
> #endif /* __ARM64_KVM_HOST_H__ */
>
>This will create a new conflict, but will make the resolution 100% clear.
I applied this, but arm64 defconfig wouldn't build until I uncommented
the '#define kvm_call_hyp(...' line.
Is that right?
Thanks,
Brian
>
>Thanks,
>
> M.
>--
>Jazz is not dead. It just smells funny...
>
>_______________________________________________
>linux-arm-kernel mailing list
>linux-arm-kernel at lists.infradead.org
>http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
next prev parent reply other threads:[~2016-02-22 11:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1aXlz4-000486-Pb@optimist>
2016-02-22 10:08 ` next-20160222 build: 5 failures 9 warnings (next-20160222) Mark Brown
2016-02-22 10:41 ` Marc Zyngier
2016-02-22 11:52 ` Brian Starkey [this message]
2016-02-22 12:00 ` Marc Zyngier
2016-02-22 12:07 ` Brian Starkey
2016-02-22 12:44 ` Marc Zyngier
2016-02-22 13:19 ` Stephen Rothwell
2016-02-24 3:28 ` Mark Brown
2016-02-24 3:48 ` Stephen Rothwell
2016-02-24 4:16 ` Mark Brown
2016-02-22 10:19 ` Mark Brown
2016-02-22 10:25 ` Mark Brown
2016-02-22 10:37 ` Jean-Philippe Brucker
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=20160222115243.GA5779@e106950-lin.cambridge.arm.com \
--to=brian.starkey@arm.com \
--cc=linux-arm-kernel@lists.infradead.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).