aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/tty_io.c3
-rw-r--r--include/linux/tty.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 558ca927e32b..b9fce77c8f03 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -155,6 +155,7 @@ int tty_ioctl(struct inode * inode, struct file * file,
155 unsigned int cmd, unsigned long arg); 155 unsigned int cmd, unsigned long arg);
156static int tty_fasync(int fd, struct file * filp, int on); 156static int tty_fasync(int fd, struct file * filp, int on);
157static void release_tty(struct tty_struct *tty, int idx); 157static void release_tty(struct tty_struct *tty, int idx);
158static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
158 159
159/** 160/**
160 * alloc_tty_struct - allocate a tty object 161 * alloc_tty_struct - allocate a tty object
@@ -3791,7 +3792,7 @@ void proc_clear_tty(struct task_struct *p)
3791} 3792}
3792EXPORT_SYMBOL(proc_clear_tty); 3793EXPORT_SYMBOL(proc_clear_tty);
3793 3794
3794void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty) 3795static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty)
3795{ 3796{
3796 if (tty) { 3797 if (tty) {
3797 tty->session = process_session(tsk); 3798 tty->session = process_session(tsk);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 8427c9e98e6b..0a10a4e7bbc3 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -333,7 +333,6 @@ extern int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
333 333
334extern dev_t tty_devnum(struct tty_struct *tty); 334extern dev_t tty_devnum(struct tty_struct *tty);
335extern void proc_clear_tty(struct task_struct *p); 335extern void proc_clear_tty(struct task_struct *p);
336extern void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
337extern void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); 336extern void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
338extern struct tty_struct *get_current_tty(void); 337extern struct tty_struct *get_current_tty(void);
339 338