Commit 03a875ed authored by Pekka Enberg's avatar Pekka Enberg

SLQB: Fix GFP masking

Commit dcce284a ("mm: Extend gfp masking to the
page allocator") introduced a global 'gfp_allowed_mask' for masking GFP flags.
Use that in SLQB to fix a compilation error.
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 0bccd99f
...@@ -68,12 +68,6 @@ static int slqb_min_order; ...@@ -68,12 +68,6 @@ static int slqb_min_order;
*/ */
static int slqb_min_objects = 1; static int slqb_min_objects = 1;
/*
* The slab allocator is initialized with interrupts disabled. Therefore, make
* sure early boot allocations don't accidentally enable interrupts.
*/
static gfp_t slab_gfp_mask __read_mostly = SLAB_GFP_BOOT_MASK;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
static inline int slab_numa(struct kmem_cache *s) static inline int slab_numa(struct kmem_cache *s)
{ {
...@@ -1545,7 +1539,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s, ...@@ -1545,7 +1539,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,
void *object; void *object;
unsigned long flags; unsigned long flags;
gfpflags &= slab_gfp_mask; gfpflags &= gfp_allowed_mask;
again: again:
local_irq_save(flags); local_irq_save(flags);
...@@ -2986,10 +2980,6 @@ void __init kmem_cache_init(void) ...@@ -2986,10 +2980,6 @@ void __init kmem_cache_init(void)
void __init kmem_cache_init_late(void) void __init kmem_cache_init_late(void)
{ {
/*
* Interrupts are enabled now so all GFP allocations are safe.
*/
slab_gfp_mask = __GFP_BITS_MASK;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment