aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory_hotplug.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memory_hotplug.c')
-rw-r--r--mm/memory_hotplug.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 3a47871a29d9..9512a544d044 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -39,7 +39,7 @@ static struct resource *register_memory_resource(u64 start, u64 size)
39 res->name = "System RAM"; 39 res->name = "System RAM";
40 res->start = start; 40 res->start = start;
41 res->end = start + size - 1; 41 res->end = start + size - 1;
42 res->flags = IORESOURCE_MEM; 42 res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
43 if (request_resource(&iomem_resource, res) < 0) { 43 if (request_resource(&iomem_resource, res) < 0) {
44 printk("System RAM resource %llx - %llx cannot be added\n", 44 printk("System RAM resource %llx - %llx cannot be added\n",
45 (unsigned long long)res->start, (unsigned long long)res->end); 45 (unsigned long long)res->start, (unsigned long long)res->end);
@@ -574,8 +574,8 @@ repeat:
574 /* Ok, all of our target is islaoted. 574 /* Ok, all of our target is islaoted.
575 We cannot do rollback at this point. */ 575 We cannot do rollback at this point. */
576 offline_isolated_pages(start_pfn, end_pfn); 576 offline_isolated_pages(start_pfn, end_pfn);
577 /* reset pagetype flags */ 577 /* reset pagetype flags and makes migrate type to be MOVABLE */
578 start_isolate_page_range(start_pfn, end_pfn); 578 undo_isolate_page_range(start_pfn, end_pfn);
579 /* removal success */ 579 /* removal success */
580 zone->present_pages -= offlined_pages; 580 zone->present_pages -= offlined_pages;
581 zone->zone_pgdat->node_present_pages -= offlined_pages; 581 zone->zone_pgdat->node_present_pages -= offlined_pages;