Merge tag 'mm-nonmm-stable-2023-06-24-19-23' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/arch/Kconfig b/arch/Kconfig
index 6517e5477459338ca9493c12f546d79c0264c171..aff2746c8af28b6ca56e3335e063936cbf911e33 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -34,6 +34,29 @@ config ARCH_HAS_SUBPAGE_FAULTS
 config HOTPLUG_SMT
        bool
 
+# Selected by HOTPLUG_CORE_SYNC_DEAD or HOTPLUG_CORE_SYNC_FULL
+config HOTPLUG_CORE_SYNC
+       bool
+
+# Basic CPU dead synchronization selected by architecture
+config HOTPLUG_CORE_SYNC_DEAD
+       bool
+       select HOTPLUG_CORE_SYNC
+
+# Full CPU synchronization with alive state selected by architecture
+config HOTPLUG_CORE_SYNC_FULL
+       bool
+       select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU
+       select HOTPLUG_CORE_SYNC
+
+config HOTPLUG_SPLIT_STARTUP
+       bool
+       select HOTPLUG_CORE_SYNC_FULL
+
+config HOTPLUG_PARALLEL
+       bool
+       select HOTPLUG_SPLIT_STARTUP
+
 config GENERIC_ENTRY
        bool
 
@@ -285,6 +308,9 @@ config ARCH_HAS_DMA_SET_UNCACHED
 config ARCH_HAS_DMA_CLEAR_UNCACHED
        bool
 
+config ARCH_HAS_CPU_FINALIZE_INIT
+       bool
+
 # Select if arch init_task must go in the __init_task_data section
 config ARCH_TASK_STRUCT_ON_STACK
        bool
@@ -1182,13 +1208,6 @@ config COMPAT_32BIT_TIME
 config ARCH_NO_PREEMPT
        bool
 
-config ARCH_EPHEMERAL_INODES
-       def_bool n
-       help
-         An arch should select this symbol if it doesn't keep track of inode
-         instances on its own, but instead relies on something else (e.g. the
-         host kernel for an UML kernel).
-
 config ARCH_SUPPORTS_RT
        bool