X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=9b223af6a147f6fc82b22c58d1d878f09fb80053;hb=867578cbccb0893cc14fc29c670f7185809c90d6;hp=71d10bf52dc846533eb3270ddb7cdd2ce0e26f0b;hpb=0263c12c12ccc90edc9d856fa839f8936183e6d1;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 71d10bf..9b223af 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -603,13 +603,6 @@ void pagefault_out_of_memory(void)
 		/* Got some memory back in the last second. */
 		return;
 
-	/*
-	 * If this is from memcg, oom-killer is already invoked.
-	 * and not worth to go system-wide-oom.
-	 */
-	if (mem_cgroup_oom_called(current))
-		goto rest_and_return;
-
 	if (sysctl_panic_on_oom)
 		panic("out of memory from page fault. panic_on_oom is selected.\n");
 
@@ -621,7 +614,6 @@ void pagefault_out_of_memory(void)
 	 * Give "p" a good chance of killing itself before we
 	 * retry to allocate memory.
 	 */
-rest_and_return:
 	if (!test_thread_flag(TIF_MEMDIE))
 		schedule_timeout_uninterruptible(1);
 }