Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[sfrench/cifs-2.6.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index e446bb5b3f8d7783f9a22eb140706908df539dbf..1ec34e16ed65d38c1e7a7d0c44e11c01a1fa7a71 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -452,6 +452,23 @@ config PPC_TRANSACTIONAL_MEM
        help
          Support user-mode Transactional Memory on POWERPC.
 
+config PPC_UV
+       bool "Ultravisor support"
+       depends on KVM_BOOK3S_HV_POSSIBLE
+       select ZONE_DEVICE
+       select DEV_PAGEMAP_OPS
+       select DEVICE_PRIVATE
+       select MEMORY_HOTPLUG
+       select MEMORY_HOTREMOVE
+       default n
+       help
+         This option paravirtualizes the kernel to run in POWER platforms that
+         supports the Protected Execution Facility (PEF). On such platforms,
+         the ultravisor firmware runs at a privilege level above the
+         hypervisor.
+
+         If unsure, say "N".
+
 config LD_HEAD_STUB_CATCH
        bool "Reserve 256 bytes to cope with linker stubs in HEAD text" if EXPERT
        depends on PPC64