KVM: Export include/linux/kvm.h only if $ARCH actually supports KVM

Currently, make headers_check barfs due to <asm/kvm.h>, which <linux/kvm.h>
includes, not existing.  Rather than add a zillion <asm/kvm.h>s, export kvm.h
only if the arch actually supports it.

Signed-off-by: Avi Kivity <avi@qumranet.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index fb3eea3e38ee192af15126169939988828bf3afe..d289cfcf92c402bf33c46a155b942a47842387d1 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -107,6 +107,7 @@ config ARCH_SUPPORTS_OPROFILE
        bool
        default y
 
+select HAVE_KVM
 
 config ZONE_DMA32
        bool

diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 656920636cb2f6dafba5ffbd0dc41c7c177e601e..c83e1c9b5129b3cc96ecfcb8992e378cd7d4119e 100644 (file)
--- a/drivers/kvm/Kconfig
+++ b/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/include/linux/Kbuild b/include/linux/Kbuild
index c263a69b5680a87efac302cea7826a7055629639..85b2482cc736c782307c99afd26a7b1f834f38d9 100644 (file)
--- a/include/linux/Kbuild
+++ b/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