aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slab.c
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-12-06 23:33:19 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:24 -0500
commit441e143e95f5aa1e04026cb0aa71c801ba53982f (patch)
tree884855ea1fdaa65ebc885ffebc65ee3a26f8a78f /mm/slab.c
parente94b1766097d53e6f3ccfb36c8baa562ffeda3fc (diff)
[PATCH] slab: remove SLAB_DMA
SLAB_DMA is an alias of GFP_DMA. This is the last one so we remove the leftover comment too. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 1f374c1df018..bb831ba63e1e 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2637,7 +2637,7 @@ static void cache_init_objs(struct kmem_cache *cachep,
2637 2637
2638static void kmem_flagcheck(struct kmem_cache *cachep, gfp_t flags) 2638static void kmem_flagcheck(struct kmem_cache *cachep, gfp_t flags)
2639{ 2639{
2640 if (flags & SLAB_DMA) 2640 if (flags & GFP_DMA)
2641 BUG_ON(!(cachep->gfpflags & GFP_DMA)); 2641 BUG_ON(!(cachep->gfpflags & GFP_DMA));
2642 else 2642 else
2643 BUG_ON(cachep->gfpflags & GFP_DMA); 2643 BUG_ON(cachep->gfpflags & GFP_DMA);
@@ -2721,7 +2721,7 @@ static int cache_grow(struct kmem_cache *cachep, gfp_t flags, int nodeid)
2721 * Be lazy and only check for valid flags here, keeping it out of the 2721 * Be lazy and only check for valid flags here, keeping it out of the
2722 * critical path in kmem_cache_alloc(). 2722 * critical path in kmem_cache_alloc().
2723 */ 2723 */
2724 BUG_ON(flags & ~(SLAB_DMA | GFP_LEVEL_MASK | __GFP_NO_GROW)); 2724 BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK | __GFP_NO_GROW));
2725 if (flags & __GFP_NO_GROW) 2725 if (flags & __GFP_NO_GROW)
2726 return 0; 2726 return 0;
2727 2727