1 files changed, 12 insertions, 3 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 06c6d9ab5a8d..7eba5b5723e9 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -396,17 +396,26 @@ config HOTPLUG_CPU
           can be controlled through /sys/devices/system/cpu/cpu#.
           Say N if you want to disable CPU hotplug.
 
+config SCHED_SMT
+        def_bool n
+
 config SCHED_MC
         def_bool n
 
 config SCHED_BOOK
+        def_bool n
+
+config SCHED_TOPOLOGY
         def_bool y
-        prompt "Book scheduler support"
+        prompt "Topology scheduler support"
         depends on SMP
+        select SCHED_SMT
         select SCHED_MC
+        select SCHED_BOOK
         help
-          Book scheduler support improves the CPU scheduler's decision making
-          when dealing with machines that have several books.
+          Topology scheduler support improves the CPU scheduler's decision
+          making when dealing with machines that have multi-threading,
+          multiple cores or multiple books.
 
 source kernel/Kconfig.preempt