Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / powerpc / kvm / Kconfig

diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 60624cc..b7baff7 100644 (file)
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -22,12 +22,34 @@ config KVM
        select ANON_INODES
        select KVM_MMIO
 
+config KVM_BOOK3S_HANDLER
+       bool
+
+config KVM_BOOK3S_32_HANDLER
+       bool
+       select KVM_BOOK3S_HANDLER
+
 config KVM_BOOK3S_64_HANDLER
        bool
+       select KVM_BOOK3S_HANDLER
+
+config KVM_BOOK3S_32
+       tristate "KVM support for PowerPC book3s_32 processors"
+       depends on EXPERIMENTAL && PPC_BOOK3S_32 && !SMP && !PTE_64BIT
+       select KVM
+       select KVM_BOOK3S_32_HANDLER
+       ---help---
+         Support running unmodified book3s_32 guest kernels
+         in virtual machines on book3s_32 host processors.
+
+         This module provides access to the hardware capabilities through
+         a character device node named /dev/kvm.
+
+         If unsure, say N.
 
 config KVM_BOOK3S_64
        tristate "KVM support for PowerPC book3s_64 processors"
-       depends on EXPERIMENTAL && PPC64
+       depends on EXPERIMENTAL && PPC_BOOK3S_64
        select KVM
        select KVM_BOOK3S_64_HANDLER
        ---help---