aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@gnu.org>2012-10-08 19:29:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-09 03:22:24 -0400
commit01dc52ebdf472f77cca623ca693ca24cfc0f1bbe (patch)
tree2d0f35f2aff418d52a84fb50974ad3bacf68d4bd /kernel
parentd5dc0ad928fb9e972001e552597fd0b794863f34 (diff)
oom: remove deprecated oom_adj
The deprecated /proc/<pid>/oom_adj is scheduled for removal this month. Signed-off-by: Davidlohr Bueso <dave@gnu.org> Acked-by: David Rientjes <rientjes@google.com> Cc: 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 'kernel')
-rw-r--r--kernel/fork.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index ec667f797af3..972762e01024 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1056,7 +1056,6 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
1056 init_rwsem(&sig->group_rwsem); 1056 init_rwsem(&sig->group_rwsem);
1057#endif 1057#endif
1058 1058
1059 sig->oom_adj = current->signal->oom_adj;
1060 sig->oom_score_adj = current->signal->oom_score_adj; 1059 sig->oom_score_adj = current->signal->oom_score_adj;
1061 sig->oom_score_adj_min = current->signal->oom_score_adj_min; 1060 sig->oom_score_adj_min = current->signal->oom_score_adj_min;
1062 1061