aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memblock.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index dd7989929f13..fc7824fa1b42 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -612,14 +612,12 @@ static int __init_memblock memblock_add_region(phys_addr_t base,
612 int nid, 612 int nid,
613 unsigned long flags) 613 unsigned long flags)
614{ 614{
615 struct memblock_type *type = &memblock.memory;
616
617 memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n", 615 memblock_dbg("memblock_add: [%#016llx-%#016llx] flags %#02lx %pF\n",
618 (unsigned long long)base, 616 (unsigned long long)base,
619 (unsigned long long)base + size - 1, 617 (unsigned long long)base + size - 1,
620 flags, (void *)_RET_IP_); 618 flags, (void *)_RET_IP_);
621 619
622 return memblock_add_range(type, base, size, nid, flags); 620 return memblock_add_range(&memblock.memory, base, size, nid, flags);
623} 621}
624 622
625int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size) 623int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
@@ -740,14 +738,12 @@ static int __init_memblock memblock_reserve_region(phys_addr_t base,
740 int nid, 738 int nid,
741 unsigned long flags) 739 unsigned long flags)
742{ 740{
743 struct memblock_type *type = &memblock.reserved;
744
745 memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n", 741 memblock_dbg("memblock_reserve: [%#016llx-%#016llx] flags %#02lx %pF\n",
746 (unsigned long long)base, 742 (unsigned long long)base,
747 (unsigned long long)base + size - 1, 743 (unsigned long long)base + size - 1,
748 flags, (void *)_RET_IP_); 744 flags, (void *)_RET_IP_);
749 745
750 return memblock_add_range(type, base, size, nid, flags); 746 return memblock_add_range(&memblock.reserved, base, size, nid, flags);
751} 747}
752 748
753int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) 749int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)