Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

mm: zap ZONE_OOM_LOCKED

Browse Source 
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>
This commit is contained in:
Vladimir Davydov 2016-07-26 15:22:30 -07:00 committed by Linus Torvalds
parent a371d9f1cc
commit 798fd75695
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/mmzone.h
View File

@ -524,7 +524,6 @@ struct zone {
enum zone_flags { enum zone_flags {
ZONE_RECLAIM_LOCKED, /* prevents concurrent reclaim */ ZONE_RECLAIM_LOCKED, /* prevents concurrent reclaim */
ZONE_OOM_LOCKED, /* zone is in OOM killer zonelist */
ZONE_CONGESTED, /* zone has many dirty pages backed by ZONE_CONGESTED, /* zone has many dirty pages backed by
* a congested BDI * a congested BDI
*/ */

4
mm/oom_kill.c
View File

@ -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 * 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 * memory-hogging task. If oom_lock is held by somebody else, a parallel oom
* parallel oom killing is already in progress so do nothing. * killing is already in progress so do nothing.
*/ */
void pagefault_out_of_memory(void) void pagefault_out_of_memory(void)
{ {