diff options
-rw-r--r-- | mm/memblock.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 3f37a0bca5d5..9318b567ed79 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
@@ -580,10 +580,24 @@ int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size, | |||
580 | return memblock_add_range(&memblock.memory, base, size, nid, 0); | 580 | return memblock_add_range(&memblock.memory, base, size, nid, 0); |
581 | } | 581 | } |
582 | 582 | ||
583 | static int __init_memblock memblock_add_region(phys_addr_t base, | ||
584 | phys_addr_t size, | ||
585 | int nid, | ||
586 | unsigned long flags) | ||
587 | { | ||
588 | struct memblock_type *_rgn = &memblock.memory; | ||
589 | |||
590 | memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n", | ||
591 | (unsigned long long)base, | ||
592 | (unsigned long long)base + size - 1, | ||
593 | flags, (void *)_RET_IP_); | ||
594 | |||
595 | return memblock_add_range(_rgn, base, size, nid, flags); | ||
596 | } | ||
597 | |||
583 | int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) | 598 | int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) |
584 | { | 599 | { |
585 | return memblock_add_range(&memblock.memory, base, size, | 600 | return memblock_add_region(base, size, MAX_NUMNODES, 0); |
586 | MAX_NUMNODES, 0); | ||
587 | } | 601 | } |
588 | 602 | ||
589 | /** | 603 | /** |