Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5af60839 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

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: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 96018fda

arch/powerpc/mm/hugetlbpage.c

+1 −2
Original line number Diff line number Diff line
@@ -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");

arch/powerpc/mm/init_64.c

+1 −2
Original line number Diff line number Diff line
@@ -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])

arch/sparc64/mm/tsb.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

include/linux/slab.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ typedef struct kmem_cache kmem_cache_t __deprecated; 
#define SLAB_POISON		0x00000800UL	/* DEBUG: Poison objects */

#define SLAB_HWCACHE_ALIGN	0x00002000UL	/* Align objs on cache lines */

#define SLAB_CACHE_DMA		0x00004000UL	/* Use GFP_DMA memory */

#define SLAB_MUST_HWCACHE_ALIGN	0x00008000UL	/* Force alignment even if debuggin is active */

#define SLAB_STORE_USER		0x00010000UL	/* DEBUG: Store the last owner for bug hunting */

#define SLAB_RECLAIM_ACCOUNT	0x00020000UL	/* Objects are reclaimable */

#define SLAB_PANIC		0x00040000UL	/* Panic if kmem_cache_create() fails */

mm/slab.c

+2 −2
Original line number Diff line number Diff line
@@ -175,12 +175,12 @@ 
# define CREATE_MASK	(SLAB_DEBUG_INITIAL | SLAB_RED_ZONE | \

			 SLAB_POISON | SLAB_HWCACHE_ALIGN | \

			 SLAB_CACHE_DMA | \

			 SLAB_MUST_HWCACHE_ALIGN | SLAB_STORE_USER | \

			 SLAB_STORE_USER | \

			 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \

			 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD)

#else

# define CREATE_MASK	(SLAB_HWCACHE_ALIGN | \

			 SLAB_CACHE_DMA | SLAB_MUST_HWCACHE_ALIGN | \

			 SLAB_CACHE_DMA | \

			 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \

			 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD)

#endif