Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

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

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 5c845e8d59d92f8cd3594fccf1476503d8957149..daafeb20f99370310feceaaeb1186e8f9fa8e74c 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -8,11 +8,12 @@ config PARISC
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_SYSCALL_TRACEPOINTS
        select ARCH_WANT_FRAME_POINTERS
+       select ARCH_HAS_CPU_CACHE_ALIASING
        select ARCH_HAS_DMA_ALLOC if PA11
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_STRICT_KERNEL_RWX
        select ARCH_HAS_STRICT_MODULE_RWX
-       select ARCH_HAS_UBSAN_SANITIZE_ALL
+       select ARCH_HAS_UBSAN
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_NO_SG_CHAIN
        select ARCH_SUPPORTS_HUGETLBFS if PA20
@@ -237,9 +238,9 @@ config PARISC_HUGE_KERNEL
        def_bool y if !MODULES || UBSAN || FTRACE || COMPILE_TEST
 
 config MLONGCALLS
-       def_bool y if PARISC_HUGE_KERNEL
        bool "Enable the -mlong-calls compiler option for big kernels" if !PARISC_HUGE_KERNEL
        depends on PA8X00
+       default PARISC_HUGE_KERNEL
        help
          If you configure the kernel to include many drivers built-in instead
          as modules, the kernel executable may become too big, so that the
@@ -254,9 +255,9 @@ config MLONGCALLS
          Enabling this option will probably slow down your kernel.
 
 config 64BIT
-       def_bool y if "$(ARCH)" = "parisc64"
        bool "64-bit kernel" if "$(ARCH)" = "parisc"
        depends on PA8X00
+       default "$(ARCH)" = "parisc64"
        help
          Enable this if you want to support 64bit kernel on PA-RISC platform.
 
@@ -273,6 +274,7 @@ choice
 
 config PARISC_PAGE_SIZE_4KB
        bool "4KB"
+       select HAVE_PAGE_SIZE_4KB
        help
          This lets you select the page size of the kernel.  For best
          performance, a page size of 16KB is recommended.  For best
@@ -288,10 +290,12 @@ config PARISC_PAGE_SIZE_4KB
 
 config PARISC_PAGE_SIZE_16KB
        bool "16KB"
+       select HAVE_PAGE_SIZE_16KB
        depends on PA8X00 && BROKEN && !KFENCE
 
 config PARISC_PAGE_SIZE_64KB
        bool "64KB"
+       select HAVE_PAGE_SIZE_64KB
        depends on PA8X00 && BROKEN && !KFENCE
 
 endchoice