diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 95872bdfec4e0570ad7edafe3e0f85f6d9a1754b..a6b76624f5b89cfc1c002fdb1eed59a5a68ef74a 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -1069,9 +1069,10 @@ bool out_of_memory(struct oom_control *oc)
 	 * The OOM killer does not compensate for IO-less reclaim.
 	 * pagefault_out_of_memory lost its gfp context so we have to
 	 * make sure exclude 0 mask - all other users should have at least
-	 * ___GFP_DIRECT_RECLAIM to get here.
+	 * ___GFP_DIRECT_RECLAIM to get here. But mem_cgroup_oom() has to
+	 * invoke the OOM killer even if it is a GFP_NOFS allocation.
 	 */
-	if (oc->gfp_mask && !(oc->gfp_mask & __GFP_FS))
+	if (oc->gfp_mask && !(oc->gfp_mask & __GFP_FS) && !is_memcg_oom(oc))
 		return true;
 
 	/*