Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 2a0ea3ef509eb063118eef9cc2d43b1ddc58ffc1..efddbf0926b283ae5ef292e076ff9900842c4dd5 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -288,8 +288,8 @@ static void migrate_page_copy(struct page *newpage, struct page *page)
        if (TestClearPageActive(page)) {
                VM_BUG_ON(PageUnevictable(page));
                SetPageActive(newpage);
-       } else
-               unevictable_migrate_page(newpage, page);
+       } else if (TestClearPageUnevictable(page))
+               SetPageUnevictable(newpage);
        if (PageChecked(page))
                SetPageChecked(newpage);
        if (PageMappedToDisk(page))