diff --git a/[refs] b/[refs] index fa52b52e440e..6fbf14b9ceed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db8450673458e724229e91050ac9a92253b01234 +refs/heads/master: b1e0541674904db00e17ce646b0a1d54f59136a5 diff --git a/trunk/mm/slab_common.c b/trunk/mm/slab_common.c index 6d73f0b7f21c..2f0e7d5976cb 100644 --- a/trunk/mm/slab_common.c +++ b/trunk/mm/slab_common.c @@ -382,7 +382,7 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags) index = fls(size - 1); #ifdef CONFIG_ZONE_DMA - if (unlikely((flags & SLAB_CACHE_DMA))) + if (unlikely((flags & GFP_DMA))) return kmalloc_dma_caches[index]; #endif