diff options
| -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, | |||
| 99 | phys_addr_t this_start, this_end, cand; | 99 | phys_addr_t this_start, this_end, cand; |
| 100 | u64 i; | 100 | u64 i; |
| 101 | 101 | ||
| 102 | /* align @size to avoid excessive fragmentation on reserved array */ | ||
| 103 | size = round_up(size, align); | ||
| 104 | |||
| 105 | /* pump up @end */ | 102 | /* pump up @end */ |
| 106 | if (end == MEMBLOCK_ALLOC_ACCESSIBLE) | 103 | if (end == MEMBLOCK_ALLOC_ACCESSIBLE) |
| 107 | end = memblock.current_limit; | 104 | end = memblock.current_limit; |
| @@ -731,6 +728,9 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size, | |||
| 731 | { | 728 | { |
| 732 | phys_addr_t found; | 729 | phys_addr_t found; |
| 733 | 730 | ||
| 731 | /* align @size to avoid excessive fragmentation on reserved array */ | ||
| 732 | size = round_up(size, align); | ||
| 733 | |||
| 734 | found = memblock_find_in_range_node(0, max_addr, size, align, nid); | 734 | found = memblock_find_in_range_node(0, max_addr, size, align, nid); |
| 735 | if (found && !memblock_reserve(found, size)) | 735 | if (found && !memblock_reserve(found, size)) |
| 736 | return found; | 736 | return found; |
