mm/memblock: reorder parameters of memblock_find_in_range_node
Reorder parameters of memblock_find_in_range_node to be consistent with other memblock APIs. The change was suggested by Tejun Heo <tj@kernel.org>. Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Tejun Heo <tj@kernel.org> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: Paul Walmsley <paul@pwsan.com> Cc: Pavel Machek <pavel@ucw.cz> Cc: Russell King <linux@arm.linux.org.uk> Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
79f40fab0b
commit
87029ee939
3 changed files with 12 additions and 11 deletions
|
@ -55,8 +55,9 @@ extern bool movable_node_enabled;
|
||||||
#define memblock_dbg(fmt, ...) \
|
#define memblock_dbg(fmt, ...) \
|
||||||
if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
|
if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
|
||||||
|
|
||||||
phys_addr_t memblock_find_in_range_node(phys_addr_t start, phys_addr_t end,
|
phys_addr_t memblock_find_in_range_node(phys_addr_t size, phys_addr_t align,
|
||||||
phys_addr_t size, phys_addr_t align, int nid);
|
phys_addr_t start, phys_addr_t end,
|
||||||
|
int nid);
|
||||||
phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end,
|
phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end,
|
||||||
phys_addr_t size, phys_addr_t align);
|
phys_addr_t size, phys_addr_t align);
|
||||||
phys_addr_t get_allocated_memblock_reserved_regions_info(phys_addr_t *addr);
|
phys_addr_t get_allocated_memblock_reserved_regions_info(phys_addr_t *addr);
|
||||||
|
|
|
@ -157,10 +157,10 @@ __memblock_find_range_top_down(phys_addr_t start, phys_addr_t end,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* memblock_find_in_range_node - find free area in given range and node
|
* memblock_find_in_range_node - find free area in given range and node
|
||||||
* @start: start of candidate range
|
|
||||||
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE}
|
|
||||||
* @size: size of free area to find
|
* @size: size of free area to find
|
||||||
* @align: alignment of free area to find
|
* @align: alignment of free area to find
|
||||||
|
* @start: start of candidate range
|
||||||
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE}
|
||||||
* @nid: nid of the free area to find, %MAX_NUMNODES for any node
|
* @nid: nid of the free area to find, %MAX_NUMNODES for any node
|
||||||
*
|
*
|
||||||
* Find @size free area aligned to @align in the specified range and node.
|
* 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,
|
||||||
* RETURNS:
|
* RETURNS:
|
||||||
* Found address on success, 0 on failure.
|
* Found address on success, 0 on failure.
|
||||||
*/
|
*/
|
||||||
phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size,
|
||||||
phys_addr_t end, phys_addr_t size,
|
phys_addr_t align, phys_addr_t start,
|
||||||
phys_addr_t align, int nid)
|
phys_addr_t end, int nid)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
phys_addr_t kernel_end;
|
phys_addr_t kernel_end;
|
||||||
|
@ -241,7 +241,7 @@ phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start,
|
||||||
phys_addr_t end, phys_addr_t size,
|
phys_addr_t end, phys_addr_t size,
|
||||||
phys_addr_t align)
|
phys_addr_t align)
|
||||||
{
|
{
|
||||||
return memblock_find_in_range_node(start, end, size, align,
|
return memblock_find_in_range_node(size, align, start, end,
|
||||||
MAX_NUMNODES);
|
MAX_NUMNODES);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -975,7 +975,7 @@ static phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
|
||||||
/* align @size to avoid excessive fragmentation on reserved array */
|
/* align @size to avoid excessive fragmentation on reserved array */
|
||||||
size = round_up(size, align);
|
size = round_up(size, align);
|
||||||
|
|
||||||
found = memblock_find_in_range_node(0, max_addr, size, align, nid);
|
found = memblock_find_in_range_node(size, align, 0, max_addr, nid);
|
||||||
if (found && !memblock_reserve(found, size))
|
if (found && !memblock_reserve(found, size))
|
||||||
return found;
|
return found;
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
|
||||||
if (limit > memblock.current_limit)
|
if (limit > memblock.current_limit)
|
||||||
limit = memblock.current_limit;
|
limit = memblock.current_limit;
|
||||||
|
|
||||||
addr = memblock_find_in_range_node(goal, limit, size, align, nid);
|
addr = memblock_find_in_range_node(size, align, goal, limit, nid);
|
||||||
if (!addr)
|
if (!addr)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue