1 files changed, 14 insertions, 2 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 302291429953..6a82972aeae5 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1387,10 +1387,13 @@ int remove_memory(u64 start, u64 size)
         unsigned long start_pfn, end_pfn;
         unsigned long pfn, section_nr;
         int ret;
+        int return_on_error = 0;
+        int retry = 0;
 
         start_pfn = PFN_DOWN(start);
         end_pfn = start_pfn + PFN_DOWN(size);
 
+repeat:
         for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
                 section_nr = pfn_to_section_nr(pfn);
                 if (!present_section_nr(section_nr))
@@ -1409,14 +1412,23 @@ int remove_memory(u64 start, u64 size)
 
                 ret = offline_memory_block(mem);
                 if (ret) {
-                        kobject_put(&mem->dev.kobj);
-                        return ret;
+                        if (return_on_error) {
+                                kobject_put(&mem->dev.kobj);
+                                return ret;
+                        } else {
+                                retry = 1;
+                        }
                 }
         }
 
         if (mem)
                 kobject_put(&mem->dev.kobj);
 
+        if (retry) {
+                return_on_error = 1;
+                goto repeat;
+        }
+
         return 0;
 }
 #else