diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/slab.c | 6 | ||||
-rw-r--r-- | mm/slub.c | 3 |
2 files changed, 2 insertions, 7 deletions
@@ -2746,9 +2746,7 @@ static int cache_grow(struct kmem_cache *cachep, | |||
2746 | * Be lazy and only check for valid flags here, keeping it out of the | 2746 | * Be lazy and only check for valid flags here, keeping it out of the |
2747 | * critical path in kmem_cache_alloc(). | 2747 | * critical path in kmem_cache_alloc(). |
2748 | */ | 2748 | */ |
2749 | BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK | __GFP_NO_GROW)); | 2749 | BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK)); |
2750 | if (flags & __GFP_NO_GROW) | ||
2751 | return 0; | ||
2752 | 2750 | ||
2753 | ctor_flags = SLAB_CTOR_CONSTRUCTOR; | 2751 | ctor_flags = SLAB_CTOR_CONSTRUCTOR; |
2754 | local_flags = (flags & GFP_LEVEL_MASK); | 2752 | local_flags = (flags & GFP_LEVEL_MASK); |
@@ -3252,7 +3250,7 @@ retry: | |||
3252 | flags | GFP_THISNODE, nid); | 3250 | flags | GFP_THISNODE, nid); |
3253 | } | 3251 | } |
3254 | 3252 | ||
3255 | if (!obj && !(flags & __GFP_NO_GROW)) { | 3253 | if (!obj) { |
3256 | /* | 3254 | /* |
3257 | * This allocation will be performed within the constraints | 3255 | * This allocation will be performed within the constraints |
3258 | * of the current cpuset / memory policy requirements. | 3256 | * of the current cpuset / memory policy requirements. |
@@ -815,9 +815,6 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) | |||
815 | void *last; | 815 | void *last; |
816 | void *p; | 816 | void *p; |
817 | 817 | ||
818 | if (flags & __GFP_NO_GROW) | ||
819 | return NULL; | ||
820 | |||
821 | BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK)); | 818 | BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK)); |
822 | 819 | ||
823 | if (flags & __GFP_WAIT) | 820 | if (flags & __GFP_WAIT) |