|
@@ -1771,7 +1771,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid)
|
|
|
flags |= __GFP_COMP;
|
|
|
#endif
|
|
|
|
|
|
- flags |= cachep->gfpflags;
|
|
|
+ flags |= cachep->allocflags;
|
|
|
if (cachep->flags & SLAB_RECLAIM_ACCOUNT)
|
|
|
flags |= __GFP_RECLAIMABLE;
|
|
|
|
|
@@ -2482,9 +2482,9 @@ kmem_cache_create (const char *name, size_t size, size_t align,
|
|
|
cachep->colour = left_over / cachep->colour_off;
|
|
|
cachep->slab_size = slab_size;
|
|
|
cachep->flags = flags;
|
|
|
- cachep->gfpflags = 0;
|
|
|
+ cachep->allocflags = 0;
|
|
|
if (CONFIG_ZONE_DMA_FLAG && (flags & SLAB_CACHE_DMA))
|
|
|
- cachep->gfpflags |= GFP_DMA;
|
|
|
+ cachep->allocflags |= GFP_DMA;
|
|
|
cachep->size = size;
|
|
|
cachep->reciprocal_buffer_size = reciprocal_value(size);
|
|
|
|
|
@@ -2831,9 +2831,9 @@ static void kmem_flagcheck(struct kmem_cache *cachep, gfp_t flags)
|
|
|
{
|
|
|
if (CONFIG_ZONE_DMA_FLAG) {
|
|
|
if (flags & GFP_DMA)
|
|
|
- BUG_ON(!(cachep->gfpflags & GFP_DMA));
|
|
|
+ BUG_ON(!(cachep->allocflags & GFP_DMA));
|
|
|
else
|
|
|
- BUG_ON(cachep->gfpflags & GFP_DMA);
|
|
|
+ BUG_ON(cachep->allocflags & GFP_DMA);
|
|
|
}
|
|
|
}
|
|
|
|