memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid()

[deliverable/linux.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index af7e4d9cf400b1109a48c2f6b4f082969569d38a..1802d97c72843669088bafd38e48ea5b8a5a8220 100644 (file)
--- 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)
 {