Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / drivers / kvm / Kconfig

diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 6cecc396e04064e6ca8f91ca766e02ea8842783e..656920636cb2f6dafba5ffbd0dc41c7c177e601e 100644 (file)
--- a/drivers/kvm/Kconfig
+++ b/drivers/kvm/Kconfig
@@ -5,12 +5,19 @@ menuconfig VIRTUALIZATION
        bool "Virtualization"
        depends on X86
        default y
+       ---help---
+         Say Y here to get to see options for using your Linux host to run other
+         operating systems inside virtual machines (guests).
+         This option alone does not add any kernel code.
+
+         If you say N, all options in this submenu will be skipped and disabled.
 
 if VIRTUALIZATION
 
 config KVM
        tristate "Kernel-based Virtual Machine (KVM) support"
        depends on X86 && EXPERIMENTAL
+       select PREEMPT_NOTIFIERS
        select ANON_INODES
        ---help---
          Support hosting fully virtualized guest machines using hardware
@@ -40,4 +47,8 @@ config KVM_AMD
          Provides support for KVM on AMD processors equipped with the AMD-V
          (SVM) extensions.
 
+# OK, it's a little counter-intuitive to do this, but it puts it neatly under
+# the virtualization menu.
+source drivers/lguest/Kconfig
+
 endif # VIRTUALIZATION