X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fshmem.c;h=b25f95ce3db76bb3e04658b3d6a0273729fbae55;hb=195d1a96ae5fdfbedb8dc4b97afee578921fa99e;hp=f9cb20ebb990468d4fb88059f5dc8570b2fb80da;hpb=1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395;p=karo-tx-linux.git

diff --git a/mm/shmem.c b/mm/shmem.c
index f9cb20ebb990..b25f95ce3db7 100644
--- 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) {