blk_end_request: changing i2o_block (take 4)

[linux-2.6] / drivers / kvm / Kconfig

diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig
index 7b64fd4aa2f3d4c99e6f4ffef4c3cdcb48ab9a90..656920636cb2f6dafba5ffbd0dc41c7c177e601e 100644 (file)
--- a/drivers/kvm/Kconfig
+++ b/drivers/kvm/Kconfig
@@ -6,7 +6,8 @@ menuconfig VIRTUALIZATION
        depends on X86
        default y
        ---help---
        depends on X86
        default y
        ---help---

-         Say Y here to get to see options for virtualization guest drivers.
+         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.
          This option alone does not add any kernel code.
 
          If you say N, all options in this submenu will be skipped and disabled.


@@ -16,6 +17,7 @@ if VIRTUALIZATION
 config KVM
        tristate "Kernel-based Virtual Machine (KVM) support"
        depends on X86 && EXPERIMENTAL
 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
        select ANON_INODES
        ---help---
          Support hosting fully virtualized guest machines using hardware


@@ -45,4 +47,8 @@ config KVM_AMD
          Provides support for KVM on AMD processors equipped with the AMD-V
          (SVM) extensions.
 
          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
 endif # VIRTUALIZATION