linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] x86, hyper: fix build with !CONFIG_KVM_GUEST
@ 2012-07-18  8:48 Avi Kivity
  2012-07-18 20:02 ` Marcelo Tosatti
  0 siblings, 1 reply; 2+ messages in thread
From: Avi Kivity @ 2012-07-18  8:48 UTC (permalink / raw)
  To: Marcelo Tosatti; +Cc: kvm, linux-kernel

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 arch/x86/kernel/cpu/hypervisor.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 6d6dd7a..a8f8fa9 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -37,7 +37,9 @@
 #endif
 	&x86_hyper_vmware,
 	&x86_hyper_ms_hyperv,
+#ifdef CONFIG_KVM_GUEST
 	&x86_hyper_kvm,
+#endif
 };
 
 const struct hypervisor_x86 *x86_hyper;
-- 
1.7.11.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] x86, hyper: fix build with !CONFIG_KVM_GUEST
  2012-07-18  8:48 [PATCH] x86, hyper: fix build with !CONFIG_KVM_GUEST Avi Kivity
@ 2012-07-18 20:02 ` Marcelo Tosatti
  0 siblings, 0 replies; 2+ messages in thread
From: Marcelo Tosatti @ 2012-07-18 20:02 UTC (permalink / raw)
  To: Avi Kivity; +Cc: kvm, linux-kernel

On Wed, Jul 18, 2012 at 11:48:50AM +0300, Avi Kivity wrote:
> Signed-off-by: Avi Kivity <avi@redhat.com>
> ---
>  arch/x86/kernel/cpu/hypervisor.c | 2 ++
>  1 file changed, 2 insertions(+)

Applied to next, thanks.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-07-18 20:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-18  8:48 [PATCH] x86, hyper: fix build with !CONFIG_KVM_GUEST Avi Kivity
2012-07-18 20:02 ` Marcelo Tosatti

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).