Memory controller: make charging gfp mask aware

[linux-2.6.git] / mm / swap_state.c

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 8825886..581b609 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -78,7 +78,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
        error = radix_tree_preload(gfp_mask);
        if (!error) {
 
-               error = mem_cgroup_cache_charge(page, current->mm);
+               error = mem_cgroup_cache_charge(page, current->mm, gfp_mask);
                if (error)
                        goto out;