From 1546dece684e9f9e71513ceb6bbfce31635f81de Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Wed, 12 Dec 2012 13:52:07 -0800 Subject: [PATCH] --- yaml --- r: 343335 b: refs/heads/master c: 0fa84a4bfa2aac8c04d45351b40765d61e1fd20d h: refs/heads/master i: 343333: 1bb9f0eb0361be9f8614353a771d24d558972272 343331: ae84633d22c000546fae0079d179b597cf83f85a 343327: a0149e8919be2f96a5b45eeee13f986eb0bde64a v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dffd6777c208..a338789a221b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efacd02e4f57d94e934ba5c84f10f8ce91158770 +refs/heads/master: 0fa84a4bfa2aac8c04d45351b40765d61e1fd20d diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index 0e30ff7b21c5..0399f146ae49 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -683,5 +683,4 @@ void pagefault_out_of_memory(void) out_of_memory(NULL, 0, 0, NULL, false); clear_zonelist_oom(zonelist, GFP_KERNEL); } - schedule_timeout_killable(1); }