]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commitdiff
mm, oom: remove redundant sleep in pagefault oom handler
authorDavid Rientjes <rientjes@google.com>
Wed, 12 Dec 2012 21:52:07 +0000 (13:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Dec 2012 01:38:34 +0000 (17:38 -0800)
out_of_memory() will already cause current to schedule if it has not been
killed, so doing it again in pagefault_out_of_memory() is redundant.
Remove it.

Signed-off-by: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/oom_kill.c

index 0e30ff7b21c541253eb0f983d8c9a07ca298a70f..0399f146ae49900a92c52ea158823cef1ad18ff2 100644 (file)
@@ -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);
 }