diff options
Diffstat (limited to 'include/linux/tty.h')
-rw-r--r-- | include/linux/tty.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 8427c9e98e6b..dee72b9a20fb 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
@@ -197,8 +197,8 @@ struct tty_struct { | |||
197 | struct mutex termios_mutex; | 197 | struct mutex termios_mutex; |
198 | struct ktermios *termios, *termios_locked; | 198 | struct ktermios *termios, *termios_locked; |
199 | char name[64]; | 199 | char name[64]; |
200 | int pgrp; | 200 | struct pid *pgrp; |
201 | int session; | 201 | struct pid *session; |
202 | unsigned long flags; | 202 | unsigned long flags; |
203 | int count; | 203 | int count; |
204 | struct winsize winsize; | 204 | struct winsize winsize; |
@@ -303,7 +303,7 @@ extern int tty_read_raw_data(struct tty_struct *tty, unsigned char *bufp, | |||
303 | int buflen); | 303 | int buflen); |
304 | extern void tty_write_message(struct tty_struct *tty, char *msg); | 304 | extern void tty_write_message(struct tty_struct *tty, char *msg); |
305 | 305 | ||
306 | extern int is_orphaned_pgrp(int pgrp); | 306 | extern int is_current_pgrp_orphaned(void); |
307 | extern int is_ignored(int sig); | 307 | extern int is_ignored(int sig); |
308 | extern int tty_signal(int sig, struct tty_struct *tty); | 308 | extern int tty_signal(int sig, struct tty_struct *tty); |
309 | extern void tty_hangup(struct tty_struct * tty); | 309 | extern void tty_hangup(struct tty_struct * tty); |
@@ -333,7 +333,6 @@ extern int tty_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
333 | 333 | ||
334 | extern dev_t tty_devnum(struct tty_struct *tty); | 334 | extern dev_t tty_devnum(struct tty_struct *tty); |
335 | extern void proc_clear_tty(struct task_struct *p); | 335 | extern void proc_clear_tty(struct task_struct *p); |
336 | extern void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); | ||
337 | extern void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); | 336 | extern void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); |
338 | extern struct tty_struct *get_current_tty(void); | 337 | extern struct tty_struct *get_current_tty(void); |
339 | 338 | ||