aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memblock.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memblock.c')
-rw-r--r--mm/memblock.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 9c0aeef19440..87d21a6ff63c 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -984,9 +984,6 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
984 if (!align) 984 if (!align)
985 align = SMP_CACHE_BYTES; 985 align = SMP_CACHE_BYTES;
986 986
987 /* align @size to avoid excessive fragmentation on reserved array */
988 size = round_up(size, align);
989
990 found = memblock_find_in_range_node(size, align, 0, max_addr, nid); 987 found = memblock_find_in_range_node(size, align, 0, max_addr, nid);
991 if (found && !memblock_reserve(found, size)) 988 if (found && !memblock_reserve(found, size))
992 return found; 989 return found;
@@ -1080,9 +1077,6 @@ static void * __init memblock_virt_alloc_internal(
1080 if (!align) 1077 if (!align)
1081 align = SMP_CACHE_BYTES; 1078 align = SMP_CACHE_BYTES;
1082 1079
1083 /* align @size to avoid excessive fragmentation on reserved array */
1084 size = round_up(size, align);
1085
1086again: 1080again:
1087 alloc = memblock_find_in_range_node(size, align, min_addr, max_addr, 1081 alloc = memblock_find_in_range_node(size, align, min_addr, max_addr,
1088 nid); 1082 nid);