diff --git a/[refs] b/[refs] index 581c6ce5dd81..304a71e2ac2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d4d862f729f0cb1ad8027203aceff49dc9f63fa +refs/heads/master: 6e0eaa4b05cf53ca5caa702fd2760a5b3376be69 diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index b831776b2fc7..9ffd1c1616bd 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/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/trunk/mm/slab.c b/trunk/mm/slab.c index 8f3f61cacb5c..e853dfe8fd7b 100644 --- a/trunk/mm/slab.c +++ b/trunk/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;