mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michal Hocko <mhocko@suse.cz>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
	Balbir Singh <bsingharora@gmail.com>,
	cgroups@vger.kernel.org, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org
Subject: Re: [patch 1/8] mm: oom_kill: remove memcg argument from oom_kill_task()
Date: Thu, 24 Nov 2011 10:07:54 +0100	[thread overview]
Message-ID: <20111124090754.GA26036@tiehlicka.suse.cz> (raw)
In-Reply-To: <1322062951-1756-2-git-send-email-hannes@cmpxchg.org>

On Wed 23-11-11 16:42:24, Johannes Weiner wrote:
> From: Johannes Weiner <jweiner@redhat.com>
> 
> 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@redhat.com>

Right you are.

Acked-by: Michal Hocko <mhocko@suse.cz>

> ---
>  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

  parent reply	other threads:[~2011-11-24  9:08 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-23 15:42 [patch 0/8] mm: memcg fixlets for 3.3 Johannes Weiner
2011-11-23 15:42 ` [patch 1/8] mm: oom_kill: remove memcg argument from oom_kill_task() Johannes Weiner
2011-11-23 22:35   ` David Rientjes
2011-11-23 23:57   ` KAMEZAWA Hiroyuki
2011-11-24  9:07   ` Michal Hocko [this message]
2011-11-28  0:37   ` Balbir Singh
2011-11-23 15:42 ` [patch 2/8] mm: unify remaining mem_cont, mem, etc. variable names to memcg Johannes Weiner
2011-11-23 22:40   ` David Rientjes
2011-11-23 23:58   ` KAMEZAWA Hiroyuki
2011-11-24  9:17   ` Michal Hocko
2011-11-28  0:42   ` Balbir Singh
2011-11-23 15:42 ` [patch 3/8] mm: memcg: clean up fault accounting Johannes Weiner
2011-11-24  0:00   ` KAMEZAWA Hiroyuki
2011-11-24  9:33   ` Michal Hocko
2011-11-24  9:51     ` Johannes Weiner
2011-11-28  0:45   ` Balbir Singh
2011-11-23 15:42 ` [patch 4/8] mm: memcg: lookup_page_cgroup (almost) never returns NULL Johannes Weiner
2011-11-24  0:01   ` KAMEZAWA Hiroyuki
2011-11-24  9:52   ` Michal Hocko
2011-11-24 10:05     ` Johannes Weiner
2011-11-24 10:26       ` Michal Hocko
2011-11-28  9:15         ` Johannes Weiner
2011-11-28  9:34           ` Johannes Weiner
2011-11-28 10:12             ` Michal Hocko
2011-11-28  7:03   ` Balbir Singh
2011-11-28  9:17     ` Johannes Weiner
2011-11-23 15:42 ` [patch 5/8] mm: memcg: remove unneeded checks from newpage_charge() Johannes Weiner
2011-11-24  0:04   ` KAMEZAWA Hiroyuki
2011-11-24  9:04     ` Johannes Weiner
2011-11-24 10:30       ` Michal Hocko
2011-11-24 11:58         ` Johannes Weiner
2011-11-23 15:42 ` [patch 6/8] mm: memcg: remove unneeded checks from uncharge_page() Johannes Weiner
2011-11-24  0:06   ` KAMEZAWA Hiroyuki
2011-11-24  9:06     ` Johannes Weiner
2011-11-24 10:34       ` Michal Hocko
2011-11-23 15:42 ` [patch 7/8] mm: memcg: modify PageCgroupAcctLRU non-atomically Johannes Weiner
2011-11-23 18:52   ` Hugh Dickins
2011-11-24  8:53     ` Johannes Weiner
2011-11-24  0:09   ` KAMEZAWA Hiroyuki
2011-11-24  8:55     ` Johannes Weiner
2011-11-23 15:42 ` [patch 8/8] mm: memcg: modify PageCgroupCache non-atomically Johannes Weiner
2011-11-24  0:13   ` KAMEZAWA Hiroyuki
2011-11-24  9:13     ` Johannes Weiner
2011-11-24  6:09 ` [patch 0/8] mm: memcg fixlets for 3.3 Balbir Singh
2011-11-24  9:45   ` Johannes Weiner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111124090754.GA26036@tiehlicka.suse.cz \
    --to=mhocko@suse.cz \
    --cc=akpm@linux-foundation.org \
    --cc=bsingharora@gmail.com \
    --cc=cgroups@vger.kernel.org \
    --cc=hannes@cmpxchg.org \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®