From 2875ce30db5657b67013869e61450d2ece6cfb9f Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Thu, 8 Nov 2012 14:18:47 +0100 Subject: [PATCH] --- yaml --- r: 335686 b: refs/heads/master c: 4bffbb3455372a26816e364fb4448810f7014452 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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