Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9079911 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: bootmem: pass pgdat instead of pgdat->bdata down the stack 



Pass down the node descriptor instead of the more specific bootmem node
descriptor down the call stack, like nobootmem does, when there is no good
reason for the two to be different.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ba539868

mm/bootmem.c

+10 −10
Original line number Diff line number Diff line
@@ -698,18 +698,19 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, 
	return ___alloc_bootmem(size, align, goal, limit);

}



static void * __init ___alloc_bootmem_node_nopanic(bootmem_data_t *bdata,

static void * __init ___alloc_bootmem_node_nopanic(pg_data_t *pgdat,

				unsigned long size, unsigned long align,

				unsigned long goal, unsigned long limit)

{

	void *ptr;



again:

	ptr = alloc_arch_preferred_bootmem(bdata, size, align, goal, limit);

	ptr = alloc_arch_preferred_bootmem(pgdat->bdata, size,

					   align, goal, limit);

	if (ptr)

		return ptr;



	ptr = alloc_bootmem_bdata(bdata, size, align, goal, limit);

	ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, limit);

	if (ptr)

		return ptr;
@@ -731,17 +732,16 @@ void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size, 
	if (WARN_ON_ONCE(slab_is_available()))

		return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);



	return ___alloc_bootmem_node_nopanic(pgdat->bdata, size,

					     align, goal, 0);

	return ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0);

}



void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, unsigned long size,

void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,

				    unsigned long align, unsigned long goal,

				    unsigned long limit)

{

	void *ptr;



	ptr = ___alloc_bootmem_node_nopanic(bdata, size, align, goal, 0);

	ptr = ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0);

	if (ptr)

		return ptr;
@@ -771,7 +771,7 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, 
	if (WARN_ON_ONCE(slab_is_available()))

		return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);



	return  ___alloc_bootmem_node(pgdat->bdata, size, align, goal, 0);

	return  ___alloc_bootmem_node(pgdat, size, align, goal, 0);

}



void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size,
@@ -869,6 +869,6 @@ void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, 
	if (WARN_ON_ONCE(slab_is_available()))

		return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);



	return ___alloc_bootmem_node(pgdat->bdata, size, align,

	return ___alloc_bootmem_node(pgdat, size, align,

				     goal, ARCH_LOW_ADDRESS_LIMIT);

}