memcg-deprecate-memoryforce_empty-knob-fix

- s/pr_info/pr_info_once/
- fix garbled printk text

Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index 06e756434f5884cbe521f1c66d6fa793d729ab55..5b3fdda3ad6bf35b6b5d928af1536a8f4448f34b 100644 (file)
--- 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 7bd7bbf11f90601746554468bffc044f0348ee90..8c056c2a38bdc0a201a873d93fe1740cdb264c68 100644 (file)
--- 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;
 }