1 files changed, 14 insertions, 18 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index cd23c081924d..f767582af4f8 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -101,28 +101,24 @@ u64 max_mem_size = U64_MAX;
 /* add this memory to iomem resource */
 static struct resource *register_memory_resource(u64 start, u64 size)
 {
-        struct resource *res, *conflict;
+        struct resource *res;
+        unsigned long flags =  IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
+        char *resource_name = "System RAM";
 
         if (start + size > max_mem_size)
                 return ERR_PTR(-E2BIG);
 
-        res = kzalloc(sizeof(struct resource), GFP_KERNEL);
-        if (!res)
-                return ERR_PTR(-ENOMEM);
-
-        res->name = "System RAM";
-        res->start = start;
-        res->end = start + size - 1;
-        res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
-        conflict =  request_resource_conflict(&iomem_resource, res);
-        if (conflict) {
-                if (conflict->desc == IORES_DESC_DEVICE_PRIVATE_MEMORY) {
-                        pr_debug("Device unaddressable memory block "
-                                 "memory hotplug at %#010llx !\n",
-                                 (unsigned long long)start);
-                }
-                pr_debug("System RAM resource %pR cannot be added\n", res);
-                kfree(res);
+        /*
+         * Request ownership of the new memory range.  This might be
+         * a child of an existing resource that was present but
+         * not marked as busy.
+         */
+        res = __request_region(&iomem_resource, start, size,
+                               resource_name, flags);
+
+        if (!res) {
+                pr_debug("Unable to reserve System RAM region: %016llx->%016llx\n",
+                                start, start + size);
                 return ERR_PTR(-EEXIST);
         }
         return res;