Commit f4b90b70 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

memcg: remove unused mem_cgroup->oom_wakeups

Since commit 49426420

 ("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: default avatarTejun Heo <>
Acked-by: default avatarMichal Hocko <>
Cc: Johannes Weiner <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent d1dc6f1b
......@@ -287,7 +287,6 @@ struct mem_cgroup {
bool oom_lock;
atomic_t under_oom;
atomic_t oom_wakeups;
int swappiness;
/* OOM-Killer disable */
......@@ -1850,17 +1849,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)
/* 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))
__wake_up(&memcg_oom_waitq, TASK_NORMAL, 0, memcg);
static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment