Merge tag 'mm-hotfixes-stable-2023-10-24-09-40' of git://git.kernel.org/pub/scm/linux...

[platform/kernel/linux-starfive.git] / arch / loongarch / Kconfig

diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index 6cda484..e14396a 100644 (file)
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -8,6 +8,7 @@ config LOONGARCH
        select ACPI_PPTT if ACPI
        select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
        select ARCH_BINFMT_ELF_STATE
+       select ARCH_DISABLE_KASAN_INLINE
        select ARCH_ENABLE_MEMORY_HOTPLUG
        select ARCH_ENABLE_MEMORY_HOTREMOVE
        select ARCH_HAS_ACPI_TABLE_UPGRADE      if ACPI
@@ -61,7 +62,7 @@ config LOONGARCH
        select ARCH_USE_QUEUED_SPINLOCKS
        select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT
        select ARCH_WANT_LD_ORPHAN_WARN
-       select ARCH_WANT_OPTIMIZE_VMEMMAP
+       select ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP
        select ARCH_WANTS_NO_INSTR
        select BUILDTIME_TABLE_SORT
        select COMMON_CLK
@@ -92,6 +93,8 @@ config LOONGARCH
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_JUMP_LABEL_RELATIVE
+       select HAVE_ARCH_KASAN
+       select HAVE_ARCH_KFENCE
        select HAVE_ARCH_KGDB if PERF_EVENTS
        select HAVE_ARCH_MMAP_RND_BITS if MMU
        select HAVE_ARCH_SECCOMP_FILTER
@@ -556,28 +559,16 @@ config CPU_HAS_PREFETCH
        bool
        default y
 
-config KEXEC
-       bool "Kexec system call"
-       select KEXEC_CORE
-       help
-         kexec is a system call that implements the ability to shutdown your
-         current kernel, and to start another kernel.  It is like a reboot
-         but it is independent of the system firmware.   And like a reboot
-         you can start any kernel with it, not just Linux.
+config ARCH_SUPPORTS_KEXEC
+       def_bool y
 
-         The name comes from the similarity to the exec system call.
+config ARCH_SUPPORTS_CRASH_DUMP
+       def_bool y
 
-config CRASH_DUMP
-       bool "Build kdump crash kernel"
+config ARCH_SELECTS_CRASH_DUMP
+       def_bool y
+       depends on CRASH_DUMP
        select RELOCATABLE
-       help
-         Generate crash dump after being started by kexec. This should
-         be normally only set in special crash dump kernels which are
-         loaded in the main kernel with kexec-tools into a specially
-         reserved region and then later executed after a crash by
-         kdump/kexec.
-
-         For more details see Documentation/admin-guide/kdump/kdump.rst
 
 config RELOCATABLE
        bool "Relocatable kernel"
@@ -668,6 +659,11 @@ config ARCH_MMAP_RND_BITS_MAX
 config ARCH_SUPPORTS_UPROBES
        def_bool y
 
+config KASAN_SHADOW_OFFSET
+       hex
+       default 0x0
+       depends on KASAN
+
 menu "Power management options"
 
 config ARCH_SUSPEND_POSSIBLE