1 files changed, 18 insertions, 21 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 9bbd6982d4e4..b2bd52ff7605 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -247,7 +247,7 @@ void __init register_page_bootmem_info_node(struct pglist_data *pgdat)
 #endif /* CONFIG_HAVE_BOOTMEM_INFO_NODE */
 
 static int __meminit __add_section(int nid, unsigned long phys_start_pfn,
-                bool want_memblock)
+                struct vmem_altmap *altmap, bool want_memblock)
 {
         int ret;
         int i;
@@ -255,7 +255,7 @@ static int __meminit __add_section(int nid, unsigned long phys_start_pfn,
         if (pfn_valid(phys_start_pfn))
                 return -EEXIST;
 
-        ret = sparse_add_one_section(NODE_DATA(nid), phys_start_pfn);
+        ret = sparse_add_one_section(NODE_DATA(nid), phys_start_pfn, altmap);
         if (ret < 0)
                 return ret;
 
@@ -289,18 +289,17 @@ static int __meminit __add_section(int nid, unsigned long phys_start_pfn,
  * add the new pages.
  */
 int __ref __add_pages(int nid, unsigned long phys_start_pfn,
-                        unsigned long nr_pages, bool want_memblock)
+                unsigned long nr_pages, struct vmem_altmap *altmap,
+                bool want_memblock)
 {
         unsigned long i;
         int err = 0;
         int start_sec, end_sec;
-        struct vmem_altmap *altmap;
 
         /* during initialize mem_map, align hot-added range to section */
         start_sec = pfn_to_section_nr(phys_start_pfn);
         end_sec = pfn_to_section_nr(phys_start_pfn + nr_pages - 1);
 
-        altmap = to_vmem_altmap((unsigned long) pfn_to_page(phys_start_pfn));
         if (altmap) {
                 /*
                  * Validate altmap is within bounds of the total request
@@ -315,7 +314,8 @@ int __ref __add_pages(int nid, unsigned long phys_start_pfn,
         }
 
         for (i = start_sec; i <= end_sec; i++) {
-                err = __add_section(nid, section_nr_to_pfn(i), want_memblock);
+                err = __add_section(nid, section_nr_to_pfn(i), altmap,
+                                want_memblock);
 
                 /*
                  * EEXIST is finally dealt with by ioresource collision
@@ -331,7 +331,6 @@ int __ref __add_pages(int nid, unsigned long phys_start_pfn,
 out:
         return err;
 }
-EXPORT_SYMBOL_GPL(__add_pages);
 
 #ifdef CONFIG_MEMORY_HOTREMOVE
 /* find the smallest valid pfn in the range [start_pfn, end_pfn) */
@@ -534,7 +533,7 @@ static void __remove_zone(struct zone *zone, unsigned long start_pfn)
 }
 
 static int __remove_section(struct zone *zone, struct mem_section *ms,
-                unsigned long map_offset)
+                unsigned long map_offset, struct vmem_altmap *altmap)
 {
         unsigned long start_pfn;
         int scn_nr;
@@ -551,7 +550,7 @@ static int __remove_section(struct zone *zone, struct mem_section *ms,
         start_pfn = section_nr_to_pfn((unsigned long)scn_nr);
         __remove_zone(zone, start_pfn);
 
-        sparse_remove_one_section(zone, ms, map_offset);
+        sparse_remove_one_section(zone, ms, map_offset, altmap);
         return 0;
 }
 
@@ -567,7 +566,7 @@ static int __remove_section(struct zone *zone, struct mem_section *ms,
  * calling offline_pages().
  */
 int __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
-                 unsigned long nr_pages)
+                 unsigned long nr_pages, struct vmem_altmap *altmap)
 {
         unsigned long i;
         unsigned long map_offset = 0;
@@ -575,10 +574,6 @@ int __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
 
         /* In the ZONE_DEVICE case device driver owns the memory region */
         if (is_dev_zone(zone)) {
-                struct page *page = pfn_to_page(phys_start_pfn);
-                struct vmem_altmap *altmap;
-
-                altmap = to_vmem_altmap((unsigned long) page);
                 if (altmap)
                         map_offset = vmem_altmap_offset(altmap);
         } else {
@@ -609,7 +604,8 @@ int __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
         for (i = 0; i < sections_to_remove; i++) {
                 unsigned long pfn = phys_start_pfn + i*PAGES_PER_SECTION;
 
-                ret = __remove_section(zone, __pfn_to_section(pfn), map_offset);
+                ret = __remove_section(zone, __pfn_to_section(pfn), map_offset,
+                                altmap);
                 map_offset = 0;
                 if (ret)
                         break;
@@ -799,8 +795,8 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon
         pgdat->node_spanned_pages = max(start_pfn + nr_pages, old_end_pfn) - pgdat->node_start_pfn;
 }
 
-void __ref move_pfn_range_to_zone(struct zone *zone,
-                unsigned long start_pfn, unsigned long nr_pages)
+void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
+                unsigned long nr_pages, struct vmem_altmap *altmap)
 {
         struct pglist_data *pgdat = zone->zone_pgdat;
         int nid = pgdat->node_id;
@@ -825,7 +821,8 @@ void __ref move_pfn_range_to_zone(struct zone *zone,
          * expects the zone spans the pfn range. All the pages in the range
          * are reserved so nobody should be touching them so we should be safe
          */
-        memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn, MEMMAP_HOTPLUG);
+        memmap_init_zone(nr_pages, nid, zone_idx(zone), start_pfn,
+                        MEMMAP_HOTPLUG, altmap);
 
         set_zone_contiguous(zone);
 }
@@ -897,7 +894,7 @@ static struct zone * __meminit move_pfn_range(int online_type, int nid,
         struct zone *zone;
 
         zone = zone_for_pfn_range(online_type, nid, start_pfn, nr_pages);
-        move_pfn_range_to_zone(zone, start_pfn, nr_pages);
+        move_pfn_range_to_zone(zone, start_pfn, nr_pages, NULL);
         return zone;
 }
 
@@ -1146,7 +1143,7 @@ int __ref add_memory_resource(int nid, struct resource *res, bool online)
         }
 
         /* call arch's memory hotadd */
-        ret = arch_add_memory(nid, start, size, true);
+        ret = arch_add_memory(nid, start, size, NULL, true);
 
         if (ret < 0)
                 goto error;
@@ -1888,7 +1885,7 @@ void __ref remove_memory(int nid, u64 start, u64 size)
         memblock_free(start, size);
         memblock_remove(start, size);
 
-        arch_remove_memory(start, size);
+        arch_remove_memory(start, size, NULL);
 
         try_offline_node(nid);