diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memblock.c | 16 | ||||
-rw-r--r-- | mm/nobootmem.c | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 6aca54812db0..a95d6dc066d5 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -157,10 +157,10 @@ __memblock_find_range_top_down(phys_addr_t start, phys_addr_t end, | |||
157 | 157 | ||
158 | /** | 158 | /** |
159 | * memblock_find_in_range_node - find free area in given range and node | 159 | * memblock_find_in_range_node - find free area in given range and node |
160 | * @start: start of candidate range | ||
161 | * @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE} | ||
162 | * @size: size of free area to find | 160 | * @size: size of free area to find |
163 | * @align: alignment of free area to find | 161 | * @align: alignment of free area to find |
162 | * @start: start of candidate range | ||
163 | * @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE} | ||
164 | * @nid: nid of the free area to find, %MAX_NUMNODES for any node | 164 | * @nid: nid of the free area to find, %MAX_NUMNODES for any node |
165 | * | 165 | * |
166 | * Find @size free area aligned to @align in the specified range and node. | 166 | * Find @size free area aligned to @align in the specified range and node. |
@@ -176,9 +176,9 @@ __memblock_find_range_top_down(phys_addr_t start, phys_addr_t end, | |||
176 | * RETURNS: | 176 | * RETURNS: |
177 | * Found address on success, 0 on failure. | 177 | * Found address on success, 0 on failure. |
178 | */ | 178 | */ |
179 | phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start, | 179 | phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size, |
180 | phys_addr_t end, phys_addr_t size, | 180 | phys_addr_t align, phys_addr_t start, |
181 | phys_addr_t align, int nid) | 181 | phys_addr_t end, int nid) |
182 | { | 182 | { |
183 | int ret; | 183 | int ret; |
184 | phys_addr_t kernel_end; | 184 | phys_addr_t kernel_end; |
@@ -241,8 +241,8 @@ phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start, | |||
241 | phys_addr_t end, phys_addr_t size, | 241 | phys_addr_t end, phys_addr_t size, |
242 | phys_addr_t align) | 242 | phys_addr_t align) |
243 | { | 243 | { |
244 | return memblock_find_in_range_node(start, end, size, align, | 244 | return memblock_find_in_range_node(size, align, start, end, |
245 | MAX_NUMNODES); | 245 | MAX_NUMNODES); |
246 | } | 246 | } |
247 | 247 | ||
248 | static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r) | 248 | static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r) |
@@ -975,7 +975,7 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size, | |||
975 | /* align @size to avoid excessive fragmentation on reserved array */ | 975 | /* align @size to avoid excessive fragmentation on reserved array */ |
976 | size = round_up(size, align); | 976 | size = round_up(size, align); |
977 | 977 | ||
978 | found = memblock_find_in_range_node(0, max_addr, size, align, nid); | 978 | found = memblock_find_in_range_node(size, align, 0, max_addr, nid); |
979 | if (found && !memblock_reserve(found, size)) | 979 | if (found && !memblock_reserve(found, size)) |
980 | return found; | 980 | return found; |
981 | 981 | ||
diff --git a/mm/nobootmem.c b/mm/nobootmem.c index 2c254d374655..59777e050d09 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c | |||
@@ -41,7 +41,7 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, | |||
41 | if (limit > memblock.current_limit) | 41 | if (limit > memblock.current_limit) |
42 | limit = memblock.current_limit; | 42 | limit = memblock.current_limit; |
43 | 43 | ||
44 | addr = memblock_find_in_range_node(goal, limit, size, align, nid); | 44 | addr = memblock_find_in_range_node(size, align, goal, limit, nid); |
45 | if (!addr) | 45 | if (!addr) |
46 | return NULL; | 46 | return NULL; |
47 | 47 | ||