Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258946
b: refs/heads/master
c: be8f684
h: refs/heads/master
v: v3
  • Loading branch information
David Rientjes authored and Linus Torvalds committed Jul 26, 2011
1 parent df047b2 commit 1306e9d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 11239836c04b50ba8453ec58ca7a7bd716ef02c1
refs/heads/master: be8f684d73d8d916847e996bf69cef14352872c6
7 changes: 3 additions & 4 deletions trunk/fs/proc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1118,10 +1118,9 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
* Warn that /proc/pid/oom_adj is deprecated, see
* Documentation/feature-removal-schedule.txt.
*/
printk_once(KERN_WARNING "%s (%d): /proc/%d/oom_adj is deprecated, "
"please use /proc/%d/oom_score_adj instead.\n",
current->comm, task_pid_nr(current),
task_pid_nr(task), task_pid_nr(task));
WARN_ONCE(1, "%s (%d): /proc/%d/oom_adj is deprecated, please use /proc/%d/oom_score_adj instead.\n",
current->comm, task_pid_nr(current), task_pid_nr(task),
task_pid_nr(task));
task->signal->oom_adj = oom_adjust;
/*
* Scale /proc/pid/oom_score_adj appropriately ensuring that a maximum
Expand Down

0 comments on commit 1306e9d

Please sign in to comment.