On Wed 23-11-11 16:42:24, Johannes Weiner wrote: > From: Johannes Weiner <jweiner@xxxxxxxxxx> > > 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 <jweiner@xxxxxxxxxx> Right you are. Acked-by: Michal Hocko <mhocko@xxxxxxx> > --- > 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 from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html