On Wed 03-06-15 15:48:30, Michal Hocko wrote:
> On Wed 03-06-15 11:38:24, Tejun Heo wrote:
> > From 92c2a5d90ecc5eeed0224a8f6ba533c621ac3ffa Mon Sep 17 00:00:00 2001
> > From: Tejun Heo <tj@xxxxxxxxxx>
> > Date: Tue, 2 Jun 2015 09:29:11 -0400
> >
> > Since 4942642080ea ("mm: memcg: handle non-error OOM situations more
> > gracefully"), nobody uses mem_cgroup->oom_wakeups. Remove it.
> >
> > Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
>
> Acked-by: Michal Hocko <mhocko@xxxxxxx>
Could you also inline __wake_up from memcg_wakeup_oom into its only
caller while you are touching that code, please?
>
> > ---
> > mm/memcontrol.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> > index 86648a7..9f39647 100644
> > --- a/mm/memcontrol.c
> > +++ b/mm/memcontrol.c
> > @@ -287,7 +287,6 @@ struct mem_cgroup {
> >
> > bool oom_lock;
> > atomic_t under_oom;
> > - atomic_t oom_wakeups;
> >
> > int swappiness;
> > /* OOM-Killer disable */
> > @@ -1852,7 +1851,6 @@ static int memcg_oom_wake_function(wait_queue_t *wait,
> >
> > static void memcg_wakeup_oom(struct mem_cgroup *memcg)
> > {
> > - atomic_inc(&memcg->oom_wakeups);
> > /* for filtering, pass "memcg" as argument. */
> > __wake_up(&memcg_oom_waitq, TASK_NORMAL, 0, memcg);
> > }
> > --
> > 2.4.2
> >
>
> --
> Michal Hocko
> SUSE Labs
--
Michal Hocko
SUSE Labs
--
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
