Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
	arch/um/include/asm/system.h

1 files changed, 15 insertions, 4 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 89fee2dcb03..6837a101437 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/migrate.h>
 #include <linux/page-isolation.h>
+#include <linux/pfn.h>
 
 #include <asm/tlbflush.h>
 
@@ -323,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;
@@ -657,8 +658,9 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                  * We can skip free pages. And we can only deal with pages on
                  * LRU.
                  */
-                ret = isolate_lru_page(page, &source);
+                ret = isolate_lru_page(page);
                 if (!ret) { /* Success */
+                        list_add_tail(&page->lru, &source);
                         move_pages--;
                 } else {
                         /* Becasue we don't have big zone->lock. we should
@@ -849,10 +851,19 @@ failed_removal:
 
         return ret;
 }
+
+int remove_memory(u64 start, u64 size)
+{
+        unsigned long start_pfn, end_pfn;
+
+        start_pfn = PFN_DOWN(start);
+        end_pfn = start_pfn + PFN_DOWN(size);
+        return offline_pages(start_pfn, end_pfn, 120 * HZ);
+}
 #else
 int remove_memory(u64 start, u64 size)
 {
         return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(remove_memory);
 #endif /* CONFIG_MEMORY_HOTREMOVE */
+EXPORT_SYMBOL_GPL(remove_memory);