---

yaml --- r: 115875 b: refs/heads/master c: de7f0cb h: refs/heads/master i: 115873: 9895c7d 115871: 31cfd7b v: v3
git-mirror · Oct 20, 2008 · 8266ece · 8266ece
1 parent 2e00a63
commit 8266ece
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a6560e02556b6f0a798c247f3a557c523d9701b
+refs/heads/master: de7f0cba96786cf9ec9da4532c1b25f733da9b6f
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
@@ -324,11 +324,11 @@ int __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
 	BUG_ON(phys_start_pfn & ~PAGE_SECTION_MASK);
 	BUG_ON(nr_pages % PAGES_PER_SECTION);
 
-	release_mem_region(phys_start_pfn << PAGE_SHIFT, nr_pages * PAGE_SIZE);
-
 	sections_to_remove = nr_pages / PAGES_PER_SECTION;
 	for (i = 0; i < sections_to_remove; i++) {
 		unsigned long pfn = phys_start_pfn + i*PAGES_PER_SECTION;
+		release_mem_region(pfn << PAGE_SHIFT,
+				   PAGES_PER_SECTION << PAGE_SHIFT);
 		ret = __remove_section(zone, __pfn_to_section(pfn));
 		if (ret)
 			break;