Commit 1e92a61c authored May 09, 2016 by Robin Humble Committed by Linus Torvalds May 09, 2016

Revert "proc/base: make prompt shell start from new line after executing "cat /proc/$pid/wchan""



This reverts the 4.6-rc1 commit 7e2bc81d ("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>

parent 44549e8f

fs/proc/base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message