diff --git a/[refs] b/[refs]
index 7b7393924aa5..d3feefe9aaff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 516bad44b9f3bdcb0be6be0252b7557bf7a149e4
+refs/heads/master: 4bffbb3455372a26816e364fb4448810f7014452
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 5dba755a43e6..d385f396dfee 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -96,6 +96,7 @@ config S390
 	select HAVE_MEMBLOCK_NODE_MAP
 	select HAVE_CMPXCHG_LOCAL
 	select HAVE_CMPXCHG_DOUBLE
+	select HAVE_ALIGNED_STRUCT_PAGE if SLUB
 	select HAVE_VIRT_CPU_ACCOUNTING
 	select VIRT_CPU_ACCOUNTING
 	select ARCH_DISCARD_MEMBLOCK