summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-12-06 20:33:10 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:23 -0800
commit6e0eaa4b05cf53ca5caa702fd2760a5b3376be69 (patch)
treef79ade4f91bf4b5c9fd5ec9605ac925740b9a8a6
parent2d4d862f729f0cb1ad8027203aceff49dc9f63fa (diff)
[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>
-rw-r--r--include/linux/slab.h2
-rw-r--r--mm/slab.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h
index b831776b2fc7..9ffd1c1616bd 100644
--- 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 8f3f61cacb5c..e853dfe8fd7b 100644
--- 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;