[PATCH] slab: remove 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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 2 insertions, 4 deletions

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 9ffd1c1616bd..6f7b9bb43065 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -26,8 +26,6 @@ typedef struct kmem_cache kmem_cache_t;
 #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.
diff --git a/mm/slab.c b/mm/slab.c
index e853dfe8fd7b..9f34b4946fba 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2721,12 +2721,12 @@ static int cache_grow(struct kmem_cache *cachep, gfp_t flags, int nodeid)
          * 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