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

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c3b44eba053323c9e7017521cf82030c6ff50ad7..c69498f4bd8c04cc6e8a4a4ae003f3e0152f582f 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -154,7 +154,7 @@ config PPC
        select ARCH_HAS_SYSCALL_WRAPPER         if !SPU_BASE && !COMPAT
        select ARCH_HAS_TICK_BROADCAST          if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAS_UACCESS_FLUSHCACHE
-       select ARCH_HAS_UBSAN_SANITIZE_ALL
+       select ARCH_HAS_UBSAN
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_KEEP_MEMBLOCK
        select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if PPC_RADIX_MMU
@@ -212,7 +212,7 @@ config PPC
        select HAVE_ARCH_HUGE_VMAP              if PPC_RADIX_MMU || PPC_8xx
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_JUMP_LABEL_RELATIVE
-       select HAVE_ARCH_KASAN                  if PPC32 && PPC_PAGE_SHIFT <= 14
+       select HAVE_ARCH_KASAN                  if PPC32 && PAGE_SHIFT <= 14
        select HAVE_ARCH_KASAN                  if PPC_RADIX_MMU
        select HAVE_ARCH_KASAN                  if PPC_BOOK3E_64
        select HAVE_ARCH_KASAN_VMALLOC          if HAVE_ARCH_KASAN
@@ -814,19 +814,23 @@ choice
 config PPC_4K_PAGES
        bool "4k page size"
        select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64
+       select HAVE_PAGE_SIZE_4KB
 
 config PPC_16K_PAGES
        bool "16k page size"
        depends on 44x || PPC_8xx
+       select HAVE_PAGE_SIZE_16KB
 
 config PPC_64K_PAGES
        bool "64k page size"
        depends on 44x || PPC_BOOK3S_64
        select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64
+       select HAVE_PAGE_SIZE_64KB
 
 config PPC_256K_PAGES
        bool "256k page size (Requires non-standard binutils settings)"
        depends on 44x && !PPC_47x
+       select HAVE_PAGE_SIZE_256KB
        help
          Make the page size 256k.
 
@@ -837,29 +841,6 @@ config PPC_256K_PAGES
 
 endchoice
 
-config PAGE_SIZE_4KB
-       def_bool y
-       depends on PPC_4K_PAGES
-
-config PAGE_SIZE_16KB
-       def_bool y
-       depends on PPC_16K_PAGES
-
-config PAGE_SIZE_64KB
-       def_bool y
-       depends on PPC_64K_PAGES
-
-config PAGE_SIZE_256KB
-       def_bool y
-       depends on PPC_256K_PAGES
-
-config PPC_PAGE_SHIFT
-       int
-       default 18 if PPC_256K_PAGES
-       default 16 if PPC_64K_PAGES
-       default 14 if PPC_16K_PAGES
-       default 12
-
 config THREAD_SHIFT
        int "Thread shift" if EXPERT
        range 13 15
@@ -896,7 +877,7 @@ config DATA_SHIFT
        default 23 if (DEBUG_PAGEALLOC || KFENCE) && PPC_8xx && PIN_TLB_DATA
        default 19 if (DEBUG_PAGEALLOC || KFENCE) && PPC_8xx
        default 24 if STRICT_KERNEL_RWX && PPC_85xx
-       default PPC_PAGE_SHIFT
+       default PAGE_SHIFT
        help
          On Book3S 32 (603+), DBATs are used to map kernel text and rodata RO.
          Smaller is the alignment, greater is the number of necessary DBATs.