From: Andrew Morton Date: Sat, 17 May 2014 13:19:30 +0000 (+1000) Subject: memcg-deprecate-memoryforce_empty-knob-fix X-Git-Tag: next-20140519~3^2~12 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5f2af0c58fb23afc40a31c50cdd20d391b5552c9;p=karo-tx-linux.git memcg-deprecate-memoryforce_empty-knob-fix - s/pr_info/pr_info_once/ - fix garbled printk text Cc: Johannes Weiner Acked-by: Michal Hocko Signed-off-by: Andrew Morton --- diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 06e756434f58..5b3fdda3ad6b 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt @@ -478,7 +478,7 @@ About use_hierarchy, see Section 6. memory.kmem.usage_in_bytes == memory.usage_in_bytes. Please note that this knob is considered deprecated and will be removed - in future. + in the future. About use_hierarchy, see Section 6. diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7bd7bbf11f90..8c056c2a38bd 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4797,10 +4797,10 @@ static ssize_t mem_cgroup_force_empty_write(struct kernfs_open_file *of, if (mem_cgroup_is_root(memcg)) return -EINVAL; - pr_info("%s (%d): memory.force_empty is deprecated and will be removed.", - current->comm, task_pid_nr(current)); - pr_cont(" Let us know if you know if it needed in your usecase at"); - pr_cont(" linux-mm@kvack.org\n"); + pr_info_once("%s (%d): memory.force_empty is deprecated and will be " + "removed. Let us know if it is needed in your usecase at " + "linux-mm@kvack.org\n", + current->comm, task_pid_nr(current)); return mem_cgroup_force_empty(memcg) ?: nbytes; }