diff options
| author | Davidlohr Bueso <dave@gnu.org> | 2012-10-08 16:29:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 16:22:24 +0900 |
| commit | 01dc52ebdf472f77cca623ca693ca24cfc0f1bbe (patch) | |
| tree | 2d0f35f2aff418d52a84fb50974ad3bacf68d4bd /mm | |
| parent | d5dc0ad928fb9e972001e552597fd0b794863f34 (diff) | |
| download | linux-3.10-01dc52ebdf472f77cca623ca693ca24cfc0f1bbe.tar.gz linux-3.10-01dc52ebdf472f77cca623ca693ca24cfc0f1bbe.tar.bz2 linux-3.10-01dc52ebdf472f77cca623ca693ca24cfc0f1bbe.zip | |
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 'mm')
| -rw-r--r-- | mm/oom_kill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 19860086163..79e0f3e2483 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -428,8 +428,8 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order, { task_lock(current); pr_warning("%s invoked oom-killer: gfp_mask=0x%x, order=%d, " - "oom_adj=%d, oom_score_adj=%d\n", - current->comm, gfp_mask, order, current->signal->oom_adj, + "oom_score_adj=%d\n", + current->comm, gfp_mask, order, current->signal->oom_score_adj); cpuset_print_task_mems_allowed(current); task_unlock(current); |