mm, oom: OOM sysrq should always kill a process

[tomoyo/tomoyo-test1.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 3390316..3934ff5 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -1058,7 +1058,7 @@ bool out_of_memory(struct oom_control *oc)
 
        if (!is_memcg_oom(oc)) {
                blocking_notifier_call_chain(&oom_notify_list, 0, &freed);
-               if (freed > 0)
+               if (freed > 0 && !is_sysrq_oom(oc))
                        /* Got some memory back in the last second. */
                        return true;
        }