a patch refresh for 3.5

diff --git a/queue-3.5/mm-fix-wrong-argument-of-migrate_huge_pages-in-soft_offline_huge_page.patch b/queue-3.5/mm-fix-wrong-argument-of-migrate_huge_pages-in-soft_offline_huge_page.patch
index 19b269812294a90980eae13555a65b914671cbdd..8599739b4e497317f87a77430ef342edd0abd88d 100644 (file)
--- a/queue-3.5/mm-fix-wrong-argument-of-migrate_huge_pages-in-soft_offline_huge_page.patch
+++ b/queue-3.5/mm-fix-wrong-argument-of-migrate_huge_pages-in-soft_offline_huge_page.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/mm/memory-failure.c
 +++ b/mm/memory-failure.c
-@@ -1431,8 +1431,8 @@ static int soft_offline_huge_page(struct
+@@ -1433,8 +1433,8 @@ static int soft_offline_huge_page(struct
        /* Keep page count to indicate a given hugepage is isolated. */
  
        list_add(&hpage->lru, &pagelist);
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (ret) {
                struct page *page1, *page2;
                list_for_each_entry_safe(page1, page2, &pagelist, lru)
-@@ -1561,7 +1561,7 @@ int soft_offline_page(struct page *page,
+@@ -1563,7 +1563,7 @@ int soft_offline_page(struct page *page,
                                            page_is_file_cache(page));
                list_add(&page->lru, &pagelist);
                ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL,