tty: Convert SAK messages to tty_notice()

Use tty_notice() for unified message format from the tty core.
Fix each message to accurately reflect the cause of each termination.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index c9d3989b1f14ed852511c6b95653d1a6065dd734..b64cd64a05636bbfcd45f992aa0467e4067b2d21 100644 (file)
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -3026,28 +3026,24 @@ void __do_SAK(struct tty_struct *tty)
        read_lock(&tasklist_lock);
        /* Kill the entire session */
        do_each_pid_task(session, PIDTYPE_SID, p) {
-               printk(KERN_NOTICE "SAK: killed process %d"
-                       " (%s): task_session(p)==tty->session\n",
-                       task_pid_nr(p), p->comm);
+               tty_notice(tty, "SAK: killed process %d (%s): by session\n",
+                          task_pid_nr(p), p->comm);
                send_sig(SIGKILL, p, 1);
        } while_each_pid_task(session, PIDTYPE_SID, p);
-       /* Now kill any processes that happen to have the
-        * tty open.
-        */
+
+       /* Now kill any processes that happen to have the tty open */
        do_each_thread(g, p) {
                if (p->signal->tty == tty) {
-                       printk(KERN_NOTICE "SAK: killed process %d"
-                           " (%s): task_session(p)==tty->session\n",
-                           task_pid_nr(p), p->comm);
+                       tty_notice(tty, "SAK: killed process %d (%s): by controlling tty\n",
+                                  task_pid_nr(p), p->comm);
                        send_sig(SIGKILL, p, 1);
                        continue;
                }
                task_lock(p);
                i = iterate_fd(p->files, 0, this_tty, tty);
                if (i != 0) {
-                       printk(KERN_NOTICE "SAK: killed process %d"
-                           " (%s): fd#%d opened to the tty\n",
-                                   task_pid_nr(p), p->comm, i - 1);
+                       tty_notice(tty, "SAK: killed process %d (%s): by fd#%d\n",
+                                  task_pid_nr(p), p->comm, i - 1);
                        force_sig(SIGKILL, p);
                }
                task_unlock(p);