Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

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

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index a78f255111f21469492bf663ab8b935fa9a53cb2..ae07470fde3c92bcf8d5c0b9da8e7abe8467e1cc 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -295,10 +295,6 @@ config PPC_STD_MMU_32
        def_bool y
        depends on PPC_STD_MMU && PPC32
 
-config PPC_STD_MMU_64
-       def_bool y
-       depends on PPC_STD_MMU && PPC64
-
 config PPC_RADIX_MMU
        bool "Radix MMU Support"
        depends on PPC_BOOK3S_64
@@ -309,6 +305,19 @@ config PPC_RADIX_MMU
          is only implemented by IBM Power9 CPUs, if you don't have one of them
          you can probably disable this.
 
+config PPC_RADIX_MMU_DEFAULT
+       bool "Default to using the Radix MMU when possible"
+       depends on PPC_RADIX_MMU
+       default y
+       help
+         When the hardware supports the Radix MMU, default to using it unless
+         "disable_radix[=yes]" is specified on the kernel command line.
+
+         If this option is disabled, the Hash MMU will be used by default,
+         unless "disable_radix=no" is specified on the kernel command line.
+
+         If you're unsure, say Y.
+
 config ARCH_ENABLE_HUGEPAGE_MIGRATION
        def_bool y
        depends on PPC_BOOK3S_64 && HUGETLB_PAGE && MIGRATION
@@ -324,7 +333,7 @@ config PPC_BOOK3E_MMU
 
 config PPC_MM_SLICES
        bool
-       default y if PPC_STD_MMU_64
+       default y if PPC_BOOK3S_64
        default n
 
 config PPC_HAVE_PMU_SUPPORT