aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 968ce3776e08..19d3202ca2dc 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1088,12 +1088,13 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node)
1088 void *last; 1088 void *last;
1089 void *p; 1089 void *p;
1090 1090
1091 BUG_ON(flags & ~(GFP_DMA | __GFP_ZERO | GFP_LEVEL_MASK)); 1091 BUG_ON(flags & GFP_SLAB_BUG_MASK);
1092 1092
1093 if (flags & __GFP_WAIT) 1093 if (flags & __GFP_WAIT)
1094 local_irq_enable(); 1094 local_irq_enable();
1095 1095
1096 page = allocate_slab(s, flags & GFP_LEVEL_MASK, node); 1096 page = allocate_slab(s,
1097 flags & (GFP_RECLAIM_MASK | GFP_CONSTRAINT_MASK), node);
1097 if (!page) 1098 if (!page)
1098 goto out; 1099 goto out;
1099 1100