Merge remote-tracking branch 'kvm/linux-next'

[karo-tx-linux.git] / arch / arm64 / kvm / Kconfig

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 38102f5d3cbbe02f03d50edc0cc2bf0269b23e2c..a5272c07d1cbf3f72a0689ecc06e07b3aed4161b 100644 (file)
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -16,9 +16,13 @@ menuconfig VIRTUALIZATION
 
 if VIRTUALIZATION
 
+config KVM_ARM_VGIC_V3
+       bool
+
 config KVM
        bool "Kernel-based Virtual Machine (KVM) support"
        depends on OF
+       depends on !ARM64_16K_PAGES
        select MMU_NOTIFIER
        select PREEMPT_NOTIFIERS
        select ANON_INODES
@@ -31,8 +35,11 @@ config KVM
        select KVM_VFIO
        select HAVE_KVM_EVENTFD
        select HAVE_KVM_IRQFD
+       select KVM_ARM_VGIC_V3
        ---help---
          Support hosting virtualized guest machines.
+         We don't support KVM with 16K page tables yet, due to the multiple
+         levels of fake page tables.
 
          If unsure, say N.