Merge branch 'for-next' of git://git.pengutronix.de/git/ukl/linux into devel-stable

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mm / Kconfig

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 8defd63..cb812a1 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -636,8 +636,9 @@ config ARM_THUMBEE
          make use of it. Say N for code that can run on CPUs without ThumbEE.
 
 config ARM_VIRT_EXT
-       bool "Native support for the ARM Virtualization Extensions"
-       depends on MMU && CPU_V7
+       bool
+       depends on MMU
+       default y if CPU_V7
        help
          Enable the kernel to make use of the ARM Virtualization
          Extensions to install hypervisors without run-time firmware
@@ -647,11 +648,6 @@ config ARM_VIRT_EXT
          use of this feature.  Refer to Documentation/arm/Booting for
          details.
 
-         It is safe to enable this option even if the kernel may not be
-         booted in HYP mode, may not have support for the
-         virtualization extensions, or may be booted with a
-         non-compliant bootloader.
-
 config SWP_EMULATE
        bool "Emulate SWP/SWPB instructions"
        depends on !CPU_USE_DOMAINS && CPU_V7