Merge tag 'v3.10.104' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / swap_state.c

diff --git a/mm/swap_state.c b/mm/swap_state.c
index f24ab0dff554262e1da6866b866a4584871f8d9c..c27a26abb78c6d912b1561c284b10470d0a00abf 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -168,7 +168,11 @@ int add_to_swap(struct page *page, struct list_head *list)
        VM_BUG_ON(!PageLocked(page));
        VM_BUG_ON(!PageUptodate(page));
 
+#ifndef CONFIG_MEMCG
        entry = get_swap_page();
+#else
+       entry = get_swap_page_by_memcg(page);
+#endif
        if (!entry.val)
                return 0;