1 files changed, 4 insertions, 4 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index adf5c3eedbc9..bbb7b043c986 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -932,8 +932,8 @@ found:
          * Charge page using GFP_HIGHUSER_MOVABLE while we can wait.
          * charged back to the user(not to caller) when swap account is used.
          */
-        error = mem_cgroup_cache_charge_swapin(page,
-                        current->mm, GFP_HIGHUSER_MOVABLE, true);
+        error = mem_cgroup_cache_charge_swapin(page, current->mm, GFP_KERNEL,
+                                        true);
         if (error)
                 goto out;
         error = radix_tree_preload(GFP_KERNEL);
@@ -1275,7 +1275,7 @@ repeat:
                          * charge against this swap cache here.
                          */
                         if (mem_cgroup_cache_charge_swapin(swappage,
-                                                current->mm, gfp, false)) {
+                                current->mm, gfp & GFP_RECLAIM_MASK, false)) {
                                 page_cache_release(swappage);
                                 error = -ENOMEM;
                                 goto failed;
@@ -1393,7 +1393,7 @@ repeat:
 
                         /* Precharge page while we can wait, compensate after */
                         error = mem_cgroup_cache_charge(filepage, current->mm,
-                                        GFP_HIGHUSER_MOVABLE);
+                                        GFP_KERNEL);
                         if (error) {
                                 page_cache_release(filepage);
                                 shmem_unacct_blocks(info->flags, 1);