Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 798fd756 authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds
Browse files

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: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a371d9f1

include/linux/mmzone.h

+0 −1
Original line number Diff line number Diff line
@@ -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

					 */

mm/oom_kill.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

{