From 7f95f6545c04e245dc5c47555764246c539dab19 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 6 Aug 2011 11:43:08 -0700 Subject: [PATCH] --- yaml --- r: 262571 b: refs/heads/master c: c21427043dec93d40e3a1af970831d1f5f15ce5d h: refs/heads/master i: 262569: c71bba2af8369280997b922b1792d955321bf1ee 262567: d8262b21826d5c3f06b4ea5564efa40b02438585 v: v3 --- [refs] | 2 +- trunk/fs/proc/base.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15a63994ad49..4fc272ed4ac7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb19a12bd2214cdcad5273d472b062a4ba97fa1 +refs/heads/master: c21427043dec93d40e3a1af970831d1f5f15ce5d diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 08e3eccf9a12..73a562bf7266 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -1118,7 +1118,7 @@ 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. */ - WARN_ONCE(1, "%s (%d): /proc/%d/oom_adj is deprecated, please use /proc/%d/oom_score_adj instead.\n", + 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)); task->signal->oom_adj = oom_adjust;