mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
mm: Extend gfp masking to the page allocator
The page allocator also needs the masking of gfp flags during boot, so this moves it out of slab/slub and uses it with the page allocator as well. Signed-off-by: Benjamin Herrenschmidt <[email protected]> Acked-by: Pekka Enberg <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
9729a6eb58
commit
dcce284a25
5 changed files with 18 additions and 25 deletions
15
mm/slab.c
15
mm/slab.c
|
|
@ -304,12 +304,6 @@ struct kmem_list3 {
|
|||
int free_touched; /* updated without locking */
|
||||
};
|
||||
|
||||
/*
|
||||
* 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;
|
||||
|
||||
/*
|
||||
* Need this for bootstrapping a per node allocator.
|
||||
*/
|
||||
|
|
@ -1559,11 +1553,6 @@ void __init kmem_cache_init_late(void)
|
|||
{
|
||||
struct kmem_cache *cachep;
|
||||
|
||||
/*
|
||||
* Interrupts are enabled now so all GFP allocations are safe.
|
||||
*/
|
||||
slab_gfp_mask = __GFP_BITS_MASK;
|
||||
|
||||
/* 6) resize the head arrays to their final sizes */
|
||||
mutex_lock(&cache_chain_mutex);
|
||||
list_for_each_entry(cachep, &cache_chain, next)
|
||||
|
|
@ -3307,7 +3296,7 @@ __cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
|
|||
unsigned long save_flags;
|
||||
void *ptr;
|
||||
|
||||
flags &= slab_gfp_mask;
|
||||
flags &= gfp_allowed_mask;
|
||||
|
||||
lockdep_trace_alloc(flags);
|
||||
|
||||
|
|
@ -3392,7 +3381,7 @@ __cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller)
|
|||
unsigned long save_flags;
|
||||
void *objp;
|
||||
|
||||
flags &= slab_gfp_mask;
|
||||
flags &= gfp_allowed_mask;
|
||||
|
||||
lockdep_trace_alloc(flags);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue