oom, PM: make OOM detection in the freezer path raceless

[mirror_ubuntu-artful-kernel.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index fe4d258ef32bd5aa53e6d2994e2358124b078464..fbf64e6f64e42cbdd9a23a006ef578cf7888b74f 100644 (file)
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1930,7 +1930,7 @@ bool mem_cgroup_oom_synchronize(bool handle)
        if (!memcg)
                return false;
 
-       if (!handle)
+       if (!handle || oom_killer_disabled)
                goto cleanup;
 
        owait.memcg = memcg;