diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 18:21:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 18:21:36 -0800 |
| commit | 98c4514ff6e3072288770db66f91bdb15af8b433 (patch) | |
| tree | eb5f2541e70d27144720e1735b463471025908f0 /arch/s390/Kconfig | |
| parent | 644a9d3b66e6983c2c1f3b24c3006d49b184c871 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
| download | linux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.gz linux-98c4514ff6e3072288770db66f91bdb15af8b433.tar.bz2 linux-98c4514ff6e3072288770db66f91bdb15af8b433.zip | |
Merge 3.7-rc6 into char-misc-next
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 5dba755a43e6..d385f396dfee 100644 --- a/arch/s390/Kconfig +++ b/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 |