From cdf5cabdae0607b2875cc440ca85548c361c7c3a Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Sun, 2 Dec 2007 10:50:06 +0200
Subject: [PATCH] --- yaml --- r: 80799 b: refs/heads/master c:
 fb56dbb31c4738a3918db81fd24da732ce3b4ae6 h: refs/heads/master i:   80797:
 a261e28f6de7b13ef1cba9364ccee911c81ab93d   80795:
 f59459bf4bb3017ab2e52de13b5cc57bed83f603   80791:
 05fb60f881c92a53b6e276f6511f7f57bdf26762   80783:
 4a9fdc06e2cb490bed25a02fa4059e2f49180d0d   80767:
 e8ec9696180473e1a1de6a904230d1064ab7c94b v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/Kconfig     | 1 +
 trunk/drivers/kvm/Kconfig  | 7 +++++--
 trunk/include/linux/Kbuild | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 99d25419e272..df5ce6e84416 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d23087847184a7417fc69bdfaa8a32834b447bef
+refs/heads/master: fb56dbb31c4738a3918db81fd24da732ce3b4ae6
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index fb3eea3e38ee..d289cfcf92c4 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -107,6 +107,7 @@ config ARCH_SUPPORTS_OPROFILE
 	bool
 	default y
 
+select HAVE_KVM
 
 config ZONE_DMA32
 	bool
diff --git a/trunk/drivers/kvm/Kconfig b/trunk/drivers/kvm/Kconfig
index 656920636cb2..c83e1c9b5129 100644
--- a/trunk/drivers/kvm/Kconfig
+++ b/trunk/drivers/kvm/Kconfig
@@ -1,9 +1,12 @@
 #
 # KVM configuration
 #
+config HAVE_KVM
+       bool
+
 menuconfig VIRTUALIZATION
 	bool "Virtualization"
-	depends on X86
+	depends on HAVE_KVM || X86
 	default y
 	---help---
 	  Say Y here to get to see options for using your Linux host to run other
@@ -16,7 +19,7 @@ if VIRTUALIZATION
 
 config KVM
 	tristate "Kernel-based Virtual Machine (KVM) support"
-	depends on X86 && EXPERIMENTAL
+	depends on HAVE_KVM && EXPERIMENTAL
 	select PREEMPT_NOTIFIERS
 	select ANON_INODES
 	---help---
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index c263a69b5680..85b2482cc736 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -255,7 +255,7 @@ unifdef-y += kd.h
 unifdef-y += kernelcapi.h
 unifdef-y += kernel.h
 unifdef-y += keyboard.h
-unifdef-y += kvm.h
+unifdef-$(CONFIG_HAVE_KVM) += kvm.h
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h