1 files changed, 12 insertions, 10 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 6629fafd6ce4..427bb291dd0f 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -74,8 +74,7 @@ static struct resource *register_memory_resource(u64 start, u64 size)
         res->end = start + size - 1;
         res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
         if (request_resource(&iomem_resource, res) < 0) {
-                printk("System RAM resource %llx - %llx cannot be added\n",
-                (unsigned long long)res->start, (unsigned long long)res->end);
+                printk("System RAM resource %pR cannot be added\n", res);
                 kfree(res);
                 res = NULL;
         }
@@ -502,8 +501,10 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages)
                 online_pages_range);
         if (ret) {
                 mutex_unlock(&zonelists_mutex);
-                printk(KERN_DEBUG "online_pages %lx at %lx failed\n",
-                        nr_pages, pfn);
+                printk(KERN_DEBUG "online_pages [mem %#010llx-%#010llx] failed\n",
+                       (unsigned long long) pfn << PAGE_SHIFT,
+                       (((unsigned long long) pfn + nr_pages)
+                            << PAGE_SHIFT) - 1);
                 memory_notify(MEM_CANCEL_ONLINE, &arg);
                 unlock_memory_hotplug();
                 return ret;
@@ -617,7 +618,7 @@ int __ref add_memory(int nid, u64 start, u64 size)
                 pgdat = hotadd_new_pgdat(nid, start);
                 ret = -ENOMEM;
                 if (!pgdat)
-                        goto out;
+                        goto error;
                 new_pgdat = 1;
         }
 
@@ -891,7 +892,7 @@ static int __ref offline_pages(unsigned long start_pfn,
         nr_pages = end_pfn - start_pfn;
 
         /* set above range as isolated */
-        ret = start_isolate_page_range(start_pfn, end_pfn);
+        ret = start_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
         if (ret)
                 goto out;
 
@@ -956,7 +957,7 @@ repeat:
            We cannot do rollback at this point. */
         offline_isolated_pages(start_pfn, end_pfn);
         /* reset pagetype flags and makes migrate type to be MOVABLE */
-        undo_isolate_page_range(start_pfn, end_pfn);
+        undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
         /* removal success */
         zone->present_pages -= offlined_pages;
         zone->zone_pgdat->node_present_pages -= offlined_pages;
@@ -977,11 +978,12 @@ repeat:
         return 0;
 
 failed_removal:
-        printk(KERN_INFO "memory offlining %lx to %lx failed\n",
-                start_pfn, end_pfn);
+        printk(KERN_INFO "memory offlining [mem %#010llx-%#010llx] failed\n",
+               (unsigned long long) start_pfn << PAGE_SHIFT,
+               ((unsigned long long) end_pfn << PAGE_SHIFT) - 1);
         memory_notify(MEM_CANCEL_OFFLINE, &arg);
         /* pushback to free area */
-        undo_isolate_page_range(start_pfn, end_pfn);
+        undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
 
 out:
         unlock_memory_hotplug();