[PATCH] x86, hyper: fix build with !CONFIG_KVM_GUEST

2012-07-18 Thread Avi Kivity 
Signed-off-by: Avi Kivity a...@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

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] x86, hyper: fix build with !CONFIG_KVM_GUEST

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

Applied to next, thanks.

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html