[PATCH] slab: remove SLAB_NO_GROW

It is only used internally in the slab.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/slab.h b/include/linux/slab.h
index b831776b2fc79cb319c38b35466054d5edcd1a62..9ffd1c1616bd493b2f2aa544f56d116ffe4c1b5c 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -28,8 +28,6 @@ typedef struct kmem_cache kmem_cache_t;
 
 #define SLAB_LEVEL_MASK                GFP_LEVEL_MASK
 
-#define        SLAB_NO_GROW            __GFP_NO_GROW   /* don't grow a cache */
-
 /* 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 8f3f61cacb5c21b5a646ff0a913be13a957eaf60..e853dfe8fd7b986ec274aa947d995ec766ee256a 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2721,8 +2721,8 @@ 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 | SLAB_NO_GROW));
-       if (flags & SLAB_NO_GROW)
+       BUG_ON(flags & ~(SLAB_DMA | SLAB_LEVEL_MASK | __GFP_NO_GROW));
+       if (flags & __GFP_NO_GROW)
                return 0;
 
        ctor_flags = SLAB_CTOR_CONSTRUCTOR;