diff options
-rw-r--r-- | include/linux/slab.h | 2 | ||||
-rw-r--r-- | mm/slab.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 9ffd1c1616bd..6f7b9bb43065 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h | |||
@@ -26,8 +26,6 @@ typedef struct kmem_cache kmem_cache_t; | |||
26 | #define SLAB_KERNEL GFP_KERNEL | 26 | #define SLAB_KERNEL GFP_KERNEL |
27 | #define SLAB_DMA GFP_DMA | 27 | #define SLAB_DMA GFP_DMA |
28 | 28 | ||
29 | #define SLAB_LEVEL_MASK GFP_LEVEL_MASK | ||
30 | |||
31 | /* flags to pass to kmem_cache_create(). | 29 | /* flags to pass to kmem_cache_create(). |
32 | * The first 3 are only valid when the allocator as been build | 30 | * The first 3 are only valid when the allocator as been build |
33 | * SLAB_DEBUG_SUPPORT. | 31 | * SLAB_DEBUG_SUPPORT. |
@@ -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 |