Merge branch 'akpm' (patches from Andrew)

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

diff --git a/mm/rmap.c b/mm/rmap.c
index 2d29a57..6aebd17 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1231,11 +1231,13 @@ void page_add_file_rmap(struct page *page, bool compound)
                                                nr_pages);
        } else {
                if (PageTransCompound(page) && page_mapping(page)) {
+                       struct page *head = compound_head(page);
+
                        VM_WARN_ON_ONCE(!PageLocked(page));
 
-                       SetPageDoubleMap(compound_head(page));
+                       SetPageDoubleMap(head);
                        if (PageMlocked(page))
-                               clear_page_mlock(compound_head(page));
+                               clear_page_mlock(head);
                }
                if (!atomic_inc_and_test(&page->_mapcount))
                        goto out;