diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc/mm/init_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 0883113624b9..dc584d26d597 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
@@ -820,7 +820,7 @@ static void __init allocate_node_data(int nid) | |||
820 | struct pglist_data *p; | 820 | struct pglist_data *p; |
821 | 821 | ||
822 | #ifdef CONFIG_NEED_MULTIPLE_NODES | 822 | #ifdef CONFIG_NEED_MULTIPLE_NODES |
823 | paddr = memblock_alloc_nid(sizeof(struct pglist_data), SMP_CACHE_BYTES, nid); | 823 | paddr = memblock_alloc_try_nid(sizeof(struct pglist_data), SMP_CACHE_BYTES, nid); |
824 | if (!paddr) { | 824 | if (!paddr) { |
825 | prom_printf("Cannot allocate pglist_data for nid[%d]\n", nid); | 825 | prom_printf("Cannot allocate pglist_data for nid[%d]\n", nid); |
826 | prom_halt(); | 826 | prom_halt(); |
@@ -840,7 +840,7 @@ static void __init allocate_node_data(int nid) | |||
840 | if (p->node_spanned_pages) { | 840 | if (p->node_spanned_pages) { |
841 | num_pages = bootmem_bootmap_pages(p->node_spanned_pages); | 841 | num_pages = bootmem_bootmap_pages(p->node_spanned_pages); |
842 | 842 | ||
843 | paddr = memblock_alloc_nid(num_pages << PAGE_SHIFT, PAGE_SIZE, nid); | 843 | paddr = memblock_alloc_try_nid(num_pages << PAGE_SHIFT, PAGE_SIZE, nid); |
844 | if (!paddr) { | 844 | if (!paddr) { |
845 | prom_printf("Cannot allocate bootmap for nid[%d]\n", | 845 | prom_printf("Cannot allocate bootmap for nid[%d]\n", |
846 | nid); | 846 | nid); |