|
|
@@ -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)
|
|
|
-{
|
|
|
- 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)
|