diff options
author | Greg Thelen <gthelen@google.com> | 2015-01-26 12:58:38 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-05 22:36:09 -0800 |
commit | 5a4a00b10aaf65d5a2a49f0691aa64118666d85e (patch) | |
tree | 4afd141cedbc51dededa72b65facf48979052fc4 /mm/memcontrol.c | |
parent | 8a71cc4d0874abd45c479f3e2830470d0dcd8b84 (diff) | |
download | linux-stable-5a4a00b10aaf65d5a2a49f0691aa64118666d85e.tar.gz linux-stable-5a4a00b10aaf65d5a2a49f0691aa64118666d85e.tar.bz2 linux-stable-5a4a00b10aaf65d5a2a49f0691aa64118666d85e.zip |
memcg: remove extra newlines from memcg oom kill log
commit 0346dadbf041a2606bcb5bd27828b0d105897f4a upstream.
Commit e61734c55c24 ("cgroup: remove cgroup->name") added two extra
newlines to memcg oom kill log messages. This makes dmesg hard to read
and parse. The issue affects 3.15+.
Example:
Task in /t <<< extra #1
killed as a result of limit of /t
<<< extra #2
memory: usage 102400kB, limit 102400kB, failcnt 274712
Remove the extra newlines from memcg oom kill messages, so the messages
look like:
Task in /t killed as a result of limit of /t
memory: usage 102400kB, limit 102400kB, failcnt 240649
Fixes: e61734c55c24 ("cgroup: remove cgroup->name")
Signed-off-by: Greg Thelen <gthelen@google.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d6ac0e33e150..4918b6eefae2 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1638,9 +1638,9 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) pr_info("Task in "); pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id)); - pr_info(" killed as a result of limit of "); + pr_cont(" killed as a result of limit of "); pr_cont_cgroup_path(memcg->css.cgroup); - pr_info("\n"); + pr_cont("\n"); rcu_read_unlock(); |