[PATCH 2/8] Get rid of SLAB_LEVEL_MASK

Christoph Lameter
2006-11-29T00:44:37Z

Get rid of SLAB_LEVEL_MASK

SLAB_LEVEL_MASK is only used internally to the slab and is
and alias of GFP_LEVEL_MASK.

Signed-off-by: Christoph Lameter <clameter@sgi.com>

Index: linux-2.6.19-rc6-mm1/include/linux/slab.h
===================================================================
--- linux-2.6.19-rc6-mm1.orig/include/linux/slab.h 2006-11-28 16:05:20.000000000 -0800
+++ linux-2.6.19-rc6-mm1/include/linux/slab.h 2006-11-28 16:07:42.000000000 -0800
@@ -24,8 +24,6 @@
#define SLAB_KERNEL GFP_KERNEL
#define SLAB_DMA GFP_DMA

-#define SLAB_LEVEL_MASK GFP_LEVEL_MASK
-
/* flags to pass to kmem_cache_create().
* The first 3 are only valid when the allocator as been build
* SLAB_DEBUG_SUPPORT.
Index: linux-2.6.19-rc6-mm1/mm/slab.c
===================================================================
--- linux-2.6.19-rc6-mm1.orig/mm/slab.c 2006-11-28 16:05:04.000000000 -0800
+++ linux-2.6.19-rc6-mm1/mm/slab.c 2006-11-28 16:06:58.000000000 -0800
@@ -2725,12 +2725,12 @@
* Be lazy and only check for valid flags here, keeping it out of the
* critical path in kmem_cache_alloc().
*/
- BUG_ON(flags & ~(SLAB_DMA | SLAB_LEVEL_MASK | __GFP_NO_GROW));
+ BUG_ON(flags & ~(SLAB_DMA | GFP_LEVEL_MASK | __GFP_NO_GROW));
if (flags & __GFP_NO_GROW)
return 0;

ctor_flags = SLAB_CTOR_CONSTRUCTOR;
- local_flags = (flags & SLAB_LEVEL_MASK);
+ local_flags = (flags & GFP_LEVEL_MASK);
if (!(local_flags & __GFP_WAIT))
/*
* Not allowed to sleep. Need to tell a constructor about