From: Christoph Lameter It is not necessary to tell the slab allocators to align to a cacheline if an explicit alignment was already specified. It is rather confusing to specify multiple alignments. Make sure that the call sites only use one form of alignment. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- arch/powerpc/mm/hugetlbpage.c | 2 +- arch/powerpc/mm/init_64.c | 2 +- arch/sparc64/mm/tsb.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/powerpc/mm/hugetlbpage.c~slab-allocators-remove-multiple-alignment-specifications arch/powerpc/mm/hugetlbpage.c --- a/arch/powerpc/mm/hugetlbpage.c~slab-allocators-remove-multiple-alignment-specifications +++ a/arch/powerpc/mm/hugetlbpage.c @@ -1057,7 +1057,7 @@ static int __init hugetlbpage_init(void) huge_pgtable_cache = kmem_cache_create("hugepte_cache", HUGEPTE_TABLE_SIZE, HUGEPTE_TABLE_SIZE, - SLAB_HWCACHE_ALIGN, + 0, zero_ctor, NULL); if (! huge_pgtable_cache) panic("hugetlbpage_init(): could not create hugepte cache\n"); diff -puN arch/powerpc/mm/init_64.c~slab-allocators-remove-multiple-alignment-specifications arch/powerpc/mm/init_64.c --- a/arch/powerpc/mm/init_64.c~slab-allocators-remove-multiple-alignment-specifications +++ a/arch/powerpc/mm/init_64.c @@ -183,7 +183,7 @@ void pgtable_cache_init(void) "for size: %08x...\n", name, i, size); pgtable_cache[i] = kmem_cache_create(name, size, size, - SLAB_HWCACHE_ALIGN, + 0, zero_ctor, NULL); if (! pgtable_cache[i]) diff -puN arch/sparc64/mm/tsb.c~slab-allocators-remove-multiple-alignment-specifications arch/sparc64/mm/tsb.c --- a/arch/sparc64/mm/tsb.c~slab-allocators-remove-multiple-alignment-specifications +++ a/arch/sparc64/mm/tsb.c @@ -262,7 +262,7 @@ void __init pgtable_cache_init(void) tsb_caches[i] = kmem_cache_create(name, size, size, - SLAB_HWCACHE_ALIGN, + 0, NULL, NULL); if (!tsb_caches[i]) { prom_printf("Could not create %s cache\n", name); _