slab allocators: Remove obsolete SLAB_MUST_HWCACHE_ALIGN

This patch was recently posted to lkml and acked by Pekka.

The flag SLAB_MUST_HWCACHE_ALIGN is

1. Never checked by SLAB at all.

2. A duplicate of SLAB_HWCACHE_ALIGN for SLUB

3. Fulfills the role of SLAB_HWCACHE_ALIGN for SLOB.

The only remaining use is in sparc64 and ppc64 and their use there
reflects some earlier role that the slab flag once may have had. If
its specified then SLAB_HWCACHE_ALIGN is also specified.

The flag is confusing, inconsistent and has no purpose.

Remove it.

Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
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, 6 deletions

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 8508f973d9cc..c8814177b716 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -1057,8 +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 |
-                                               SLAB_MUST_HWCACHE_ALIGN,
+                                               SLAB_HWCACHE_ALIGN,
                                                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 d12a87ec5ae9..5a7750147b7d 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -183,8 +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 |
-                                                     SLAB_MUST_HWCACHE_ALIGN,
+                                                     SLAB_HWCACHE_ALIGN,
                                                      zero_ctor,
                                                      NULL);
                 if (! pgtable_cache[i])
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 57eb3025537a..4be378d9a382 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -262,8 +262,7 @@ void __init pgtable_cache_init(void)
 
                 tsb_caches[i] = kmem_cache_create(name,
                                                   size, size,
-                                                  SLAB_HWCACHE_ALIGN |
-                                                  SLAB_MUST_HWCACHE_ALIGN,
+                                                  SLAB_HWCACHE_ALIGN,
                                                   NULL, NULL);
                 if (!tsb_caches[i]) {
                         prom_printf("Could not create %s cache\n", name);