diff options
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/mm/memblock.c b/mm/memblock.c index 77b5f227e1d8..99f285599501 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -99,9 +99,6 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,  	phys_addr_t this_start, this_end, cand;  	u64 i; -	/* align @size to avoid excessive fragmentation on reserved array */ -	size = round_up(size, align); -  	/* pump up @end */  	if (end == MEMBLOCK_ALLOC_ACCESSIBLE)  		end = memblock.current_limit; @@ -731,6 +728,9 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,  {  	phys_addr_t found; +	/* align @size to avoid excessive fragmentation on reserved array */ +	size = round_up(size, align); +  	found = memblock_find_in_range_node(0, max_addr, size, align, nid);  	if (found && !memblock_reserve(found, size))  		return found; | 
