diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:23 -0500 |
commit | a06d72c1dcbff015250df6ad9f0b1d18c02113bf (patch) | |
tree | e3284c3fa53817481c05a1cf8033f85ad6c6a26b /mm/slab.c | |
parent | 6e0eaa4b05cf53ca5caa702fd2760a5b3376be69 (diff) |
[PATCH] slab: remove SLAB_LEVEL_MASK
SLAB_LEVEL_MASK is only used internally to the slab and is
and alias of GFP_LEVEL_MASK.
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2721,12 +2721,12 @@ 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 | SLAB_LEVEL_MASK | __GFP_NO_GROW)); | 2724 | BUG_ON(flags & ~(SLAB_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 | ||
2728 | ctor_flags = SLAB_CTOR_CONSTRUCTOR; | 2728 | ctor_flags = SLAB_CTOR_CONSTRUCTOR; |
2729 | local_flags = (flags & SLAB_LEVEL_MASK); | 2729 | local_flags = (flags & GFP_LEVEL_MASK); |
2730 | if (!(local_flags & __GFP_WAIT)) | 2730 | if (!(local_flags & __GFP_WAIT)) |
2731 | /* | 2731 | /* |
2732 | * Not allowed to sleep. Need to tell a constructor about | 2732 | * Not allowed to sleep. Need to tell a constructor about |