UBUNTU: Ubuntu-4.13.0-45.50

[mirror_ubuntu-artful-kernel.git] / kernel / memremap.c

diff --git a/kernel/memremap.c b/kernel/memremap.c
index 124bed776532d3d2e69f4079e3f2d23da193fd2e..23a6483c3666e35fec7f927d2f6cd4a2e38dbe81 100644 (file)
--- a/kernel/memremap.c
+++ b/kernel/memremap.c
@@ -358,11 +358,7 @@ void *devm_memremap_pages(struct device *dev, struct resource *res,
                goto err_pfn_remap;
 
        mem_hotplug_begin();
-       error = arch_add_memory(nid, align_start, align_size, false);
-       if (!error)
-               move_pfn_range_to_zone(&NODE_DATA(nid)->node_zones[ZONE_DEVICE],
-                                       align_start >> PAGE_SHIFT,
-                                       align_size >> PAGE_SHIFT);
+       error = arch_add_memory(nid, align_start, align_size, true);
        mem_hotplug_done();
        if (error)
                goto err_add_memory;