Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ab1c8bd966664eb311311c3ef2dc9f8426a97a40..e41419af171be1b47124dfbe8f912482d42f9cb6 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -15,7 +15,7 @@ config MIPS
        select ARCH_HAS_STRNCPY_FROM_USER
        select ARCH_HAS_STRNLEN_USER
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
-       select ARCH_HAS_UBSAN_SANITIZE_ALL
+       select ARCH_HAS_UBSAN
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_KEEP_MEMBLOCK
        select ARCH_USE_BUILTIN_BSWAP
@@ -82,6 +82,9 @@ config MIPS
        select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
        select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_NMI
+       select HAVE_PAGE_SIZE_4KB if !CPU_LOONGSON2EF && !CPU_LOONGSON64
+       select HAVE_PAGE_SIZE_16KB if !CPU_R3000
+       select HAVE_PAGE_SIZE_64KB if !CPU_R3000
        select HAVE_PERF_EVENTS
        select HAVE_PERF_REGS
        select HAVE_PERF_USER_STACK_DUMP
@@ -1609,6 +1612,8 @@ config CPU_CAVIUM_OCTEON
        depends on SYS_HAS_CPU_CAVIUM_OCTEON
        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_64BIT_KERNEL
+       select HAVE_PAGE_SIZE_8KB if !MIPS_VA_BITS_48
+       select HAVE_PAGE_SIZE_32KB if !MIPS_VA_BITS_48
        select WEAK_ORDERING
        select CPU_SUPPORTS_HIGHMEM
        select CPU_SUPPORTS_HUGEPAGES
@@ -2030,59 +2035,6 @@ config ZBOOT_LOAD_ADDRESS
 
          This is only used if non-zero.
 
-choice
-       prompt "Kernel page size"
-       default PAGE_SIZE_4KB
-
-config PAGE_SIZE_4KB
-       bool "4kB"
-       depends on !CPU_LOONGSON2EF && !CPU_LOONGSON64
-       help
-         This option select the standard 4kB Linux page size.  On some
-         R3000-family processors this is the only available page size.  Using
-         4kB page size will minimize memory consumption and is therefore
-         recommended for low memory systems.
-
-config PAGE_SIZE_8KB
-       bool "8kB"
-       depends on CPU_CAVIUM_OCTEON
-       depends on !MIPS_VA_BITS_48
-       help
-         Using 8kB page size will result in higher performance kernel at
-         the price of higher memory consumption.  This option is available
-         only on cnMIPS processors.  Note that you will need a suitable Linux
-         distribution to support this.
-
-config PAGE_SIZE_16KB
-       bool "16kB"
-       depends on !CPU_R3000
-       help
-         Using 16kB page size will result in higher performance kernel at
-         the price of higher memory consumption.  This option is available on
-         all non-R3000 family processors.  Note that you will need a suitable
-         Linux distribution to support this.
-
-config PAGE_SIZE_32KB
-       bool "32kB"
-       depends on CPU_CAVIUM_OCTEON
-       depends on !MIPS_VA_BITS_48
-       help
-         Using 32kB page size will result in higher performance kernel at
-         the price of higher memory consumption.  This option is available
-         only on cnMIPS cores.  Note that you will need a suitable Linux
-         distribution to support this.
-
-config PAGE_SIZE_64KB
-       bool "64kB"
-       depends on !CPU_R3000
-       help
-         Using 64kB page size will result in higher performance kernel at
-         the price of higher memory consumption.  This option is available on
-         all non-R3000 family processor.  Not that at the time of this
-         writing this option is still high experimental.
-
-endchoice
-
 config ARCH_FORCE_MAX_ORDER
        int "Maximum zone order"
        default "13" if MIPS_HUGE_TLB_SUPPORT && PAGE_SIZE_64KB