summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorVladimir Davydov <vdavydov@virtuozzo.com>2016-07-26 15:22:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-26 16:19:19 -0700
commit798fd756952c4b6cb7dfe6f6437e9f02da79a5bc (patch)
tree3d3ac0de9165b1d7899376efc43323a0adb997b7 /mm
parenta371d9f1cc49f58c8be3d28c88aceaef86cb59d0 (diff)
downloadlinux-798fd756952c4b6cb7dfe6f6437e9f02da79a5bc.tar.gz
linux-798fd756952c4b6cb7dfe6f6437e9f02da79a5bc.tar.bz2
linux-798fd756952c4b6cb7dfe6f6437e9f02da79a5bc.zip
mm: zap ZONE_OOM_LOCKED
Not used since oom_lock was instroduced. Link: http://lkml.kernel.org/r/1464358093-22663-1-git-send-email-vdavydov@virtuozzo.com Signed-off-by: Vladimir Davydov <vdavydov@virtuozzo.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/oom_kill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index ddf74487f848..398c245a484a 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -988,8 +988,8 @@ bool out_of_memory(struct oom_control *oc)
/*
* The pagefault handler calls here because it is out of memory, so kill a
- * memory-hogging task. If any populated zone has ZONE_OOM_LOCKED set, a
- * parallel oom killing is already in progress so do nothing.
+ * memory-hogging task. If oom_lock is held by somebody else, a parallel oom
+ * killing is already in progress so do nothing.
*/
void pagefault_out_of_memory(void)
{