slab allocators: remove multiple alignment specifications

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 <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index c8814177b716..d0ec887f05a2 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/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 --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 5a7750147b7d..4416d5140c53 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/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 --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 4be378d9a382..8eb8a7c76ec9 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/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);