---

yaml --- r: 80799 b: refs/heads/master c: fb56dbb h: refs/heads/master i: 80797: a261e28 80795: f59459b 80791: 05fb60f 80783: 4a9fdc0 80767: e8ec969 v: v3
git-mirror · Jan 30, 2008 · cdf5cab · cdf5cab
1 parent aed0faa
commit cdf5cab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,6 +107,7 @@ config ARCH_SUPPORTS_OPROFILE @@
     	bool
     	default y
+    select HAVE_KVM
     config ZONE_DMA32
     	bool
@@ Expand Down @@