Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 33dac94922a7..66b99a2049e3 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1758,7 +1758,7 @@ static int __tty_open(struct inode *inode, struct file *filp)
         struct tty_driver *driver;
         int index;
         dev_t device = inode->i_rdev;
-        unsigned short saved_flags = filp->f_flags;
+        unsigned saved_flags = filp->f_flags;
 
         nonseekable_open(inode, filp);
 
@@ -2681,7 +2681,7 @@ void __do_SAK(struct tty_struct *tty)
         /* Kill the entire session */
         do_each_pid_task(session, PIDTYPE_SID, p) {
                 printk(KERN_NOTICE "SAK: killed process %d"
-                        " (%s): task_session_nr(p)==tty->session\n",
+                        " (%s): task_session(p)==tty->session\n",
                         task_pid_nr(p), p->comm);
                 send_sig(SIGKILL, p, 1);
         } while_each_pid_task(session, PIDTYPE_SID, p);
@@ -2691,7 +2691,7 @@ void __do_SAK(struct tty_struct *tty)
         do_each_thread(g, p) {
                 if (p->signal->tty == tty) {
                         printk(KERN_NOTICE "SAK: killed process %d"
-                            " (%s): task_session_nr(p)==tty->session\n",
+                            " (%s): task_session(p)==tty->session\n",
                             task_pid_nr(p), p->comm);
                         send_sig(SIGKILL, p, 1);
                         continue;