diff options
author | David Rientjes <rientjes@google.com> | 2012-08-01 01:42:55 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 03:42:42 +0200 |
commit | 121d1ba0a019e1465a53533aea133b1b0f6b442d (patch) | |
tree | ced96bee65407895048a50ba4cbf50a4fc0f12d2 /scripts/sortextable.c | |
parent | mm: clear pages_scanned only if draining a pcp adds pages to the buddy alloca... (diff) | |
download | linux-121d1ba0a019e1465a53533aea133b1b0f6b442d.tar.xz linux-121d1ba0a019e1465a53533aea133b1b0f6b442d.zip |
mm, oom: fix potential killing of thread that is disabled from oom killing
/proc/sys/vm/oom_kill_allocating_task will immediately kill current when
the oom killer is called to avoid a potentially expensive tasklist scan
for large systems.
Currently, however, it is not checking current's oom_score_adj value which
may be OOM_SCORE_ADJ_MIN, meaning that it has been disabled from oom
killing.
This patch avoids killing current in such a condition and simply falls
back to the tasklist scan since memory still needs to be freed.
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts/sortextable.c')
0 files changed, 0 insertions, 0 deletions