aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-06 15:39:17 -0700
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-05 12:56:24 +1000
commit9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9 (patch)
treef2c7173d47bf973d1a42ee249760b1c74d917009 /include
parentc196f76fd5ece716ee3b7fa5dda3576961c0cecc (diff)
downloadkernel_samsung_smdk4412-9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9.zip
kernel_samsung_smdk4412-9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9.tar.gz
kernel_samsung_smdk4412-9d1e24928e6a0728d1c7c76818ccbd11b93e7ac9.tar.bz2
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 'include')
-rw-r--r--include/linux/memblock.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 82b0302..c8da03e 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -50,7 +50,11 @@ extern long __init memblock_reserve(phys_addr_t base, phys_addr_t size);
/* The numa aware allocator is only available if
* CONFIG_ARCH_POPULATES_NODE_MAP is set
*/
-extern phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int nid);
+extern phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align,
+ int nid);
+extern phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
+ int nid);
+
extern phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align);
/* Flags for memblock_alloc_base() amd __memblock_alloc_base() */