drm: Round size of SHM maps to PAGE_SIZE

[deliverable/linux.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index f9cb20ebb990468d4fb88059f5dc8570b2fb80da..b25f95ce3db76bb3e04658b3d6a0273729fbae55 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1340,8 +1340,12 @@ repeat:
                        shmem_swp_unmap(entry);
                        spin_unlock(&info->lock);
                        if (error == -ENOMEM) {
-                               /* allow reclaim from this memory cgroup */
-                               error = mem_cgroup_shrink_usage(swappage,
+                               /*
+                                * reclaim from proper memory cgroup and
+                                * call memcg's OOM if needed.
+                                */
+                               error = mem_cgroup_shmem_charge_fallback(
+                                                               swappage,
                                                                current->mm,
                                                                gfp);
                                if (error) {