From 1306e9d93bbe14639dfd08418a4d92beca5dc032 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Mon, 25 Jul 2011 17:12:18 -0700 Subject: [PATCH] --- yaml --- r: 258946 b: refs/heads/master c: be8f684d73d8d916847e996bf69cef14352872c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d529c6174d60..8f447b48b031 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11239836c04b50ba8453ec58ca7a7bd716ef02c1 +refs/heads/master: be8f684d73d8d916847e996bf69cef14352872c6 diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 91fb655a5cbf..c9e3f650f23c 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -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