aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/base.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2010-08-09 20:19:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 23:45:02 -0400
commit51b1bd2ace1595b72956224deda349efa880b693 (patch)
tree82732bb33d26379c05494dcdba8ea390ae0621db /fs/proc/base.c
parenta63d83f427fbce97a6cea0db2e64b0eb8435cd10 (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 'fs/proc/base.c')
-rw-r--r--fs/proc/base.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index f923b728388a..69254a365ce2 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1037,6 +1037,14 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
1037 return -EACCES; 1037 return -EACCES;
1038 } 1038 }
1039 1039
1040 /*
1041 * Warn that /proc/pid/oom_adj is deprecated, see
1042 * Documentation/feature-removal-schedule.txt.
1043 */
1044 printk_once(KERN_WARNING "%s (%d): /proc/%d/oom_adj is deprecated, "
1045 "please use /proc/%d/oom_score_adj instead.\n",
1046 current->comm, task_pid_nr(current),
1047 task_pid_nr(task), task_pid_nr(task));
1040 task->signal->oom_adj = oom_adjust; 1048 task->signal->oom_adj = oom_adjust;
1041 /* 1049 /*
1042 * Scale /proc/pid/oom_score_adj appropriately ensuring that a maximum 1050 * Scale /proc/pid/oom_score_adj appropriately ensuring that a maximum