lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid()

Browse Source 
The former is now strict, it will fail if it cannot honor the allocation
within the node, while the later implements the previous semantic which
falls back to allocating anywhere.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2010-07-06 15:39:17 -07:00
parent c196f76fd5
commit 9d1e24928e
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mm/memblock.c
View File

@@ -537,9 +537,23 @@ phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int n
return ret;
}
return 0;
}
phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid)
{
phys_addr_t res = memblock_alloc_nid(size, align, nid);
if (res)
return res;
return memblock_alloc(size, align);
}
/*
* Remaining API functions
*/
/* You must call memblock_analyze() before this. */
phys_addr_t __init memblock_phys_mem_size(void)
{