]> git.baikalelectronics.ru Git - kernel.git/commit
mm, oom: reintroduce /proc/pid/oom_adj
authorDavid Rientjes <rientjes@google.com>
Tue, 13 Nov 2012 01:53:04 +0000 (17:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Nov 2012 18:15:35 +0000 (10:15 -0800)
commit96f9a38723e1b936c632d7451546c5da0556ea42
treefd2626b68b0f78afa128d7772c49f066e339bd3a
parente4cc3cf963f7df29a4c894d60d911dda21935fb4
mm, oom: reintroduce /proc/pid/oom_adj

This is mostly a revert of 592db13dc107 ("oom: remove deprecated oom_adj")
from Davidlohr Bueso.

It reintroduces /proc/pid/oom_adj for backwards compatibility with earlier
kernels.  It simply scales the value linearly when /proc/pid/oom_score_adj
is written.

The major difference is that its scheduled removal is no longer included
in Documentation/feature-removal-schedule.txt.  We do warn users with a
single printk, though, to suggest the more powerful and supported
/proc/pid/oom_score_adj interface.

Reported-by: Artem S. Tashkinov <t.artem@lycos.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Documentation/filesystems/proc.txt
fs/proc/base.c
include/uapi/linux/oom.h