diff options
author | David Rientjes <rientjes@google.com> | 2010-08-09 20:19:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 23:45:02 -0400 |
commit | 51b1bd2ace1595b72956224deda349efa880b693 (patch) | |
tree | 82732bb33d26379c05494dcdba8ea390ae0621db /include/linux | |
parent | a63d83f427fbce97a6cea0db2e64b0eb8435cd10 (diff) |
oom: deprecate oom_adj tunable
/proc/pid/oom_adj is now deprecated so that that it may eventually be
removed. The target date for removal is August 2012.
A warning will be printed to the kernel log if a task attempts to use this
interface. Future warning will be suppressed until the kernel is rebooted
to prevent spamming the kernel log.
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/oom.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h index 73b8d7b6dd19..f209b683e118 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h | |||
@@ -2,6 +2,9 @@ | |||
2 | #define __INCLUDE_LINUX_OOM_H | 2 | #define __INCLUDE_LINUX_OOM_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * /proc/<pid>/oom_adj is deprecated, see | ||
6 | * Documentation/feature-removal-schedule.txt. | ||
7 | * | ||
5 | * /proc/<pid>/oom_adj set to -17 protects from the oom-killer | 8 | * /proc/<pid>/oom_adj set to -17 protects from the oom-killer |
6 | */ | 9 | */ |
7 | #define OOM_DISABLE (-17) | 10 | #define OOM_DISABLE (-17) |