aboutsummaryrefslogtreecommitdiffstats
path: root/mm/oom_kill.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r--mm/oom_kill.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 71d10bf52dc8..9b223af6a147 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -603,13 +603,6 @@ void pagefault_out_of_memory(void)
603 /* Got some memory back in the last second. */ 603 /* Got some memory back in the last second. */
604 return; 604 return;
605 605
606 /*
607 * If this is from memcg, oom-killer is already invoked.
608 * and not worth to go system-wide-oom.
609 */
610 if (mem_cgroup_oom_called(current))
611 goto rest_and_return;
612
613 if (sysctl_panic_on_oom) 606 if (sysctl_panic_on_oom)
614 panic("out of memory from page fault. panic_on_oom is selected.\n"); 607 panic("out of memory from page fault. panic_on_oom is selected.\n");
615 608
@@ -621,7 +614,6 @@ void pagefault_out_of_memory(void)
621 * Give "p" a good chance of killing itself before we 614 * Give "p" a good chance of killing itself before we
622 * retry to allocate memory. 615 * retry to allocate memory.
623 */ 616 */
624rest_and_return:
625 if (!test_thread_flag(TIF_MEMDIE)) 617 if (!test_thread_flag(TIF_MEMDIE))
626 schedule_timeout_uninterruptible(1); 618 schedule_timeout_uninterruptible(1);
627} 619}