diff options
Diffstat (limited to 'mm/slab.c')
-rw-r--r-- | mm/slab.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1771,7 +1771,7 @@ static void *kmem_getpages(struct kmem_cache *cachep, gfp_t flags, int nodeid) | |||
1771 | flags |= __GFP_COMP; | 1771 | flags |= __GFP_COMP; |
1772 | #endif | 1772 | #endif |
1773 | 1773 | ||
1774 | flags |= cachep->gfpflags; | 1774 | flags |= cachep->allocflags; |
1775 | if (cachep->flags & SLAB_RECLAIM_ACCOUNT) | 1775 | if (cachep->flags & SLAB_RECLAIM_ACCOUNT) |
1776 | flags |= __GFP_RECLAIMABLE; | 1776 | flags |= __GFP_RECLAIMABLE; |
1777 | 1777 | ||
@@ -2482,9 +2482,9 @@ kmem_cache_create (const char *name, size_t size, size_t align, | |||
2482 | cachep->colour = left_over / cachep->colour_off; | 2482 | cachep->colour = left_over / cachep->colour_off; |
2483 | cachep->slab_size = slab_size; | 2483 | cachep->slab_size = slab_size; |
2484 | cachep->flags = flags; | 2484 | cachep->flags = flags; |
2485 | cachep->gfpflags = 0; | 2485 | cachep->allocflags = 0; |
2486 | if (CONFIG_ZONE_DMA_FLAG && (flags & SLAB_CACHE_DMA)) | 2486 | if (CONFIG_ZONE_DMA_FLAG && (flags & SLAB_CACHE_DMA)) |
2487 | cachep->gfpflags |= GFP_DMA; | 2487 | cachep->allocflags |= GFP_DMA; |
2488 | cachep->size = size; | 2488 | cachep->size = size; |
2489 | cachep->reciprocal_buffer_size = reciprocal_value(size); | 2489 | cachep->reciprocal_buffer_size = reciprocal_value(size); |
2490 | 2490 | ||
@@ -2831,9 +2831,9 @@ static void kmem_flagcheck(struct kmem_cache *cachep, gfp_t flags) | |||
2831 | { | 2831 | { |
2832 | if (CONFIG_ZONE_DMA_FLAG) { | 2832 | if (CONFIG_ZONE_DMA_FLAG) { |
2833 | if (flags & GFP_DMA) | 2833 | if (flags & GFP_DMA) |
2834 | BUG_ON(!(cachep->gfpflags & GFP_DMA)); | 2834 | BUG_ON(!(cachep->allocflags & GFP_DMA)); |
2835 | else | 2835 | else |
2836 | BUG_ON(cachep->gfpflags & GFP_DMA); | 2836 | BUG_ON(cachep->allocflags & GFP_DMA); |
2837 | } | 2837 | } |
2838 | } | 2838 | } |
2839 | 2839 | ||