diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 3a55f493c7da72b9ee7ee7ad7c8c76d9e01bed8d..d66a7c47faf30ca1fc8428ff83ef8e38a5f3a6a3 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -166,8 +166,7 @@ config SCHED_OMIT_FRAME_POINTER
 
 config PGTABLE_LEVELS
 	int
-	default 4 if 64BIT
-	default 2
+	default 4
 
 source "init/Kconfig"
 
@@ -403,7 +402,7 @@ config NODES_SPAN_OTHER_NODES
 
 config NUMA
 	bool "NUMA support"
-	depends on SMP && 64BIT && SCHED_TOPOLOGY
+	depends on SMP && SCHED_TOPOLOGY
 	default n
 	help
 	  Enable NUMA support