From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by kanga.kvack.org (Postfix) with ESMTP id BA5FD6B0169 for ; Tue, 2 Aug 2011 23:23:04 -0400 (EDT) Received: from m3.gw.fujitsu.co.jp (unknown [10.0.50.73]) by fgwmail5.fujitsu.co.jp (Postfix) with ESMTP id 58C643EE0AE for ; Wed, 3 Aug 2011 12:23:01 +0900 (JST) Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 3C24345DEB2 for ; Wed, 3 Aug 2011 12:23:01 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 23F0345DE7E for ; Wed, 3 Aug 2011 12:23:01 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 156D21DB8040 for ; Wed, 3 Aug 2011 12:23:01 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.240.81.133]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id CFCC21DB8038 for ; Wed, 3 Aug 2011 12:23:00 +0900 (JST) Date: Wed, 3 Aug 2011 12:15:32 +0900 From: KAMEZAWA Hiroyuki Subject: [BUGFIX][PATCH] memcg: fix oom schedule_timeout Message-Id: <20110803121532.1ab8d76c.kamezawa.hiroyu@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: "linux-mm@kvack.org" Cc: "linux-kernel@vger.kernel.org" , "akpm@linux-foundation.org" , Michal Hocko , "nishimura@mxp.nes.nec.co.jp" This patch is onto the latest mmotm. == Before calling schedule_timeout(), task state should be changed. Signed-off-by: KAMEZAWA Hiroyuki --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mmotm-Aug3/mm/memcontrol.c =================================================================== --- mmotm-Aug3.orig/mm/memcontrol.c +++ mmotm-Aug3/mm/memcontrol.c @@ -2005,7 +2005,7 @@ bool mem_cgroup_handle_oom(struct mem_cg if (test_thread_flag(TIF_MEMDIE) || fatal_signal_pending(current)) return false; /* Give chance to dying process */ - schedule_timeout(1); + schedule_timeout_uninterruptible(1); return true; } -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org