summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRobin Humble <plaguedbypenguins@gmail.com>2016-05-09 16:28:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-09 17:40:59 -0700
commit1e92a61c4c7ed85c1bec037c046e92d6dc762f32 (patch)
tree08d66ea652bf82340aa2b0db593c6135362b5008 /fs
parent44549e8f5eea4e0a41b487b63e616cb089922b99 (diff)
downloadlinux-1e92a61c4c7ed85c1bec037c046e92d6dc762f32.tar.gz
linux-1e92a61c4c7ed85c1bec037c046e92d6dc762f32.tar.bz2
linux-1e92a61c4c7ed85c1bec037c046e92d6dc762f32.zip
Revert "proc/base: make prompt shell start from new line after executing "cat /proc/$pid/wchan""
This reverts the 4.6-rc1 commit 7e2bc81da333 ("proc/base: make prompt shell start from new line after executing "cat /proc/$pid/wchan") because it breaks /proc/$PID/whcan formatting in ps and top. Revert also because the patch is inconsistent - it adds a newline at the end of only the '0' wchan, and does not add a newline when /proc/$PID/wchan contains a symbol name. eg. $ ps -eo pid,stat,wchan,comm PID STAT WCHAN COMMAND ... 1189 S - dbus-launch 1190 Ssl 0 dbus-daemon 1198 Sl 0 lightdm 1299 Ss ep_pol systemd 1301 S - (sd-pam) 1304 Ss wait sh Signed-off-by: Robin Humble <plaguedbypenguins@gmail.com> Cc: Minfei Huang <mnfhuang@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 92e37e224cd2..0d163a84082d 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -434,7 +434,7 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns,
&& !lookup_symbol_name(wchan, symname))
seq_printf(m, "%s", symname);
else
- seq_puts(m, "0\n");
+ seq_putc(m, '0');
return 0;
}