diff options
author | Tejun Heo <tj@kernel.org> | 2015-06-24 16:58:21 -0700 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-06-08 11:09:08 +0800 |
commit | 55c3f9b816da302026b135435a6ab67e290371f2 (patch) | |
tree | 6f0c7f06879f4e56dcdf4e865328e43afd5118f4 | |
parent | c63010b2cd84898ec464b9284dbee573c4e78134 (diff) |
memcg: remove unused mem_cgroup->oom_wakeups
Since commit 4942642080ea ("mm: memcg: handle non-error OOM situations
more gracefully"), nobody uses mem_cgroup->oom_wakeups. Remove it.
While at it, also fold memcg_wakeup_oom() into memcg_oom_recover() which
is its only user. This cleanup was suggested by Michal.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit f4b90b70b7a4f5c29c442399ffd531332356e1f5)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r-- | mm/memcontrol.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index fb7a0bbf9085..f48ff9aae320 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -289,7 +289,6 @@ struct mem_cgroup { bool oom_lock; atomic_t under_oom; - atomic_t oom_wakeups; int swappiness; /* OOM-Killer disable */ @@ -1867,17 +1866,10 @@ static int memcg_oom_wake_function(wait_queue_t *wait, return autoremove_wake_function(wait, mode, sync, arg); } -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); -} - static void memcg_oom_recover(struct mem_cgroup *memcg) { if (memcg && atomic_read(&memcg->under_oom)) - memcg_wakeup_oom(memcg); + __wake_up(&memcg_oom_waitq, TASK_NORMAL, 0, memcg); } static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order) |