diff options
Diffstat (limited to 'mm')
-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 af7e4d9cf400..1802d97c7284 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 | |||
537 | return ret; | 537 | return ret; |
538 | } | 538 | } |
539 | 539 | ||
540 | return 0; | ||
541 | } | ||
542 | |||
543 | phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid) | ||
544 | { | ||
545 | phys_addr_t res = memblock_alloc_nid(size, align, nid); | ||
546 | |||
547 | if (res) | ||
548 | return res; | ||
540 | return memblock_alloc(size, align); | 549 | return memblock_alloc(size, align); |
541 | } | 550 | } |
542 | 551 | ||
552 | |||
553 | /* | ||
554 | * Remaining API functions | ||
555 | */ | ||
556 | |||
543 | /* You must call memblock_analyze() before this. */ | 557 | /* You must call memblock_analyze() before this. */ |
544 | phys_addr_t __init memblock_phys_mem_size(void) | 558 | phys_addr_t __init memblock_phys_mem_size(void) |
545 | { | 559 | { |