From: Joonsoo Kim <js1304@gmail.com>
Date: Mon, 4 Feb 2013 14:46:46 +0000 (+0900)
Subject: mm/sl[au]b: correct allocation type check in kmalloc_slab()
X-Git-Tag: v3.11-rc1~1^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1e0541674904db00e17ce646b0a1d54f59136a5;p=platform%2Fkernel%2Flinux-stable.git

mm/sl[au]b: correct allocation type check in kmalloc_slab()

commit "slab: Common Kmalloc cache determination" made mistake
in kmalloc_slab(). SLAB_CACHE_DMA is for kmem_cache creation,
not for allocation. For allocation, we should use GFP_XXX to identify
type of allocation. So, change SLAB_CACHE_DMA to GFP_DMA.

Acked-by: Christoph Lameter <cl@linux.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 6d73f0b..2f0e7d5 100644
--- a/mm/slab_common.c
+++ b/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