scsi: cxgb4i: Fix TLS dependency

[linux-2.6-microblaze.git] / mm / huge_memory.c

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 4474cc3..9474dbc 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2476,6 +2476,12 @@ static void __split_huge_page(struct page *page, struct list_head *list,
 
        remap_page(head, nr);
 
+       if (PageSwapCache(head)) {
+               swp_entry_t entry = { .val = page_private(head) };
+
+               split_swap_cluster(entry);
+       }
+
        for (i = 0; i < nr; i++) {
                struct page *subpage = head + i;
                if (subpage == page)
@@ -2711,12 +2717,7 @@ int split_huge_page_to_list(struct page *page, struct list_head *list)
                }
 
                __split_huge_page(page, list, end, flags);
-               if (PageSwapCache(head)) {
-                       swp_entry_t entry = { .val = page_private(head) };
-
-                       ret = split_swap_cluster(entry);
-               } else
-                       ret = 0;
+               ret = 0;
        } else {
                if (IS_ENABLED(CONFIG_DEBUG_VM) && mapcount) {
                        pr_alert("total_mapcount: %u, page_count(): %u\n",