1 files changed, 3 insertions, 0 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index f1a0ae6e11b8..e3aff0175d4c 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2696,6 +2696,9 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
         if (unlikely(task_in_memcg_oom(current)))
                 goto bypass;
 
+        if (gfp_mask & __GFP_NOFAIL)
+                oom = false;
+
         /*
          * We always charge the cgroup the mm_struct belongs to.
          * The mm_struct's mem_cgroup changes on task migration if the