From: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> Subject: 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@xxxxxxxxxxxxx Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxxx> Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mmzone.h | 1 - mm/oom_kill.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN include/linux/mmzone.h~mm-zap-zone_oom_locked include/linux/mmzone.h --- a/include/linux/mmzone.h~mm-zap-zone_oom_locked +++ a/include/linux/mmzone.h @@ -524,7 +524,6 @@ struct zone { enum zone_flags { ZONE_RECLAIM_LOCKED, /* prevents concurrent reclaim */ - ZONE_OOM_LOCKED, /* zone is in OOM killer zonelist */ ZONE_CONGESTED, /* zone has many dirty pages backed by * a congested BDI */ diff -puN mm/oom_kill.c~mm-zap-zone_oom_locked mm/oom_kill.c --- a/mm/oom_kill.c~mm-zap-zone_oom_locked +++ a/mm/oom_kill.c @@ -988,8 +988,8 @@ bool out_of_memory(struct oom_control *o /* * 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) { _ -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
