1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 39db186d5c5b..5d405a1bfbe3 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -154,6 +154,7 @@ int tty_ioctl(struct inode * inode, struct file * file,
 static int tty_fasync(int fd, struct file * filp, int on);
 static void release_tty(struct tty_struct *tty, int idx);
 static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
+static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
 
 /**
  *      alloc_tty_struct        -       allocate a tty object
@@ -1558,6 +1559,18 @@ void disassociate_ctty(int on_exit)
         unlock_kernel();
 }
 
+/**
+ *
+ *      no_tty  - Ensure the current process does not have a controlling tty
+ */
+void no_tty(void)
+{
+        struct task_struct *tsk = current;
+        if (tsk->signal->leader)
+                disassociate_ctty(0);
+        proc_clear_tty(tsk);
+}
+
 
 /**
  *      stop_tty        -       propogate flow control
@@ -3280,9 +3293,7 @@ int tty_ioctl(struct inode * inode, struct file * file,
                 case TIOCNOTTY:
                         if (current->signal->tty != tty)
                                 return -ENOTTY;
-                        if (current->signal->leader)
-                                disassociate_ctty(0);
-                        proc_clear_tty(current);
+                        no_tty();
                         return 0;
                 case TIOCSCTTY:
                         return tiocsctty(tty, arg);
@@ -3844,7 +3855,7 @@ static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
         tsk->signal->tty_old_pgrp = NULL;
 }
 
-void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
+static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
 {
         spin_lock_irq(&tsk->sighand->siglock);
         __proc_set_tty(tsk, tty);