---

yaml
---
r: 356511
b: refs/heads/master
c: 993c1aa
h: refs/heads/master
i:
  356509: ae55311
  356507: 147739c
  356503: 5c38a8c
  356495: dd0a07d
  356479: d882709
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a864b9d06c71456470b3544fe4cc07bcdd29828d
+refs/heads/master: 993c1aad8f316dbafae6a0ec660ec846676838d6

trunk/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