From 8266ece80d98c3133e5f8cc6c2e819cd9604cfa8 Mon Sep 17 00:00:00 2001 From: Nathan Fontenot Date: Sat, 18 Oct 2008 20:27:14 -0700 Subject: [PATCH] --- yaml --- r: 115875 b: refs/heads/master c: de7f0cba96786cf9ec9da4532c1b25f733da9b6f h: refs/heads/master i: 115873: 9895c7d39d6ceb47b68131deed1cc498a64d6ea1 115871: 31cfd7b786682261f58439117e9286cceaa8104a v: v3 --- [refs] | 2 +- trunk/mm/memory_hotplug.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92b68ae3bd23..90227e824e70 100644 --- 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 index 3b4975815141..6837a1014372 100644 --- 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;