From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail137.messagelabs.com (mail137.messagelabs.com [216.82.249.19]) by kanga.kvack.org (Postfix) with ESMTP id 2103A6B0096 for ; Thu, 24 Nov 2011 04:07:58 -0500 (EST) Date: Thu, 24 Nov 2011 10:07:54 +0100 From: Michal Hocko Subject: Re: [patch 1/8] mm: oom_kill: remove memcg argument from oom_kill_task() Message-ID: <20111124090754.GA26036@tiehlicka.suse.cz> References: <1322062951-1756-1-git-send-email-hannes@cmpxchg.org> <1322062951-1756-2-git-send-email-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1322062951-1756-2-git-send-email-hannes@cmpxchg.org> Sender: owner-linux-mm@kvack.org List-ID: To: Johannes Weiner Cc: Andrew Morton , KAMEZAWA Hiroyuki , Balbir Singh , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org On Wed 23-11-11 16:42:24, Johannes Weiner wrote: > From: Johannes Weiner > > The memcg argument of oom_kill_task() hasn't been used since 341aea2 > 'oom-kill: remove boost_dying_task_prio()'. Kill it. > > Signed-off-by: Johannes Weiner Right you are. Acked-by: Michal Hocko > --- > mm/oom_kill.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > index 471dedb..fd9e303 100644 > --- a/mm/oom_kill.c > +++ b/mm/oom_kill.c > @@ -423,7 +423,7 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order, > } > > #define K(x) ((x) << (PAGE_SHIFT-10)) > -static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem) > +static int oom_kill_task(struct task_struct *p) > { > struct task_struct *q; > struct mm_struct *mm; > @@ -522,7 +522,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, > } > } while_each_thread(p, t); > > - return oom_kill_task(victim, mem); > + return oom_kill_task(victim); > } > > /* > -- > 1.7.6.4 > -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic -- 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