diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-06 15:39:17 -0700 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-05 12:56:24 +1000 |
| commit | 9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9 (patch) | |
| tree | f2c7173d47bf973d1a42ee249760b1c74d917009 /mm/memblock.c | |
| parent | c196f76fd5ece716ee3b7fa5dda3576961c0cecc (diff) | |
| download | kernel_samsung_smdk4412-9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9.tar.gz kernel_samsung_smdk4412-9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9.tar.bz2 kernel_samsung_smdk4412-9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9.zip | |
memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid()
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>
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index af7e4d9cf40..1802d97c728 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -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) { |