mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
memcg: remove unused mem_cgroup->oom_wakeups
Since commit 4942642080
("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>
This commit is contained in:
parent
d1dc6f1bcf
commit
f4b90b70b7
1 changed files with 1 additions and 9 deletions
|
@ -287,7 +287,6 @@ struct mem_cgroup {
|
||||||
|
|
||||||
bool oom_lock;
|
bool oom_lock;
|
||||||
atomic_t under_oom;
|
atomic_t under_oom;
|
||||||
atomic_t oom_wakeups;
|
|
||||||
|
|
||||||
int swappiness;
|
int swappiness;
|
||||||
/* OOM-Killer disable */
|
/* 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);
|
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)
|
static void memcg_oom_recover(struct mem_cgroup *memcg)
|
||||||
{
|
{
|
||||||
if (memcg && atomic_read(&memcg->under_oom))
|
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)
|
static void mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
|
||||||
|
|
Loading…
Reference in a new issue