aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/tty_io.c1
-rw-r--r--include/linux/tty.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index c927f42c8e4d..b62bb67c3414 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3721,7 +3721,6 @@ static void initialize_tty_struct(struct tty_struct *tty)
3721 tty->buf.head = tty->buf.tail = NULL; 3721 tty->buf.head = tty->buf.tail = NULL;
3722 tty_buffer_init(tty); 3722 tty_buffer_init(tty);
3723 INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc); 3723 INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc);
3724 init_MUTEX(&tty->buf.pty_sem);
3725 mutex_init(&tty->termios_mutex); 3724 mutex_init(&tty->termios_mutex);
3726 init_waitqueue_head(&tty->write_wait); 3725 init_waitqueue_head(&tty->write_wait);
3727 init_waitqueue_head(&tty->read_wait); 3726 init_waitqueue_head(&tty->read_wait);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 402de892b3ed..5824a9777ad7 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -74,7 +74,6 @@ struct tty_buffer {
74 74
75struct tty_bufhead { 75struct tty_bufhead {
76 struct delayed_work work; 76 struct delayed_work work;
77 struct semaphore pty_sem;
78 spinlock_t lock; 77 spinlock_t lock;
79 struct tty_buffer *head; /* Queue head */ 78 struct tty_buffer *head; /* Queue head */
80 struct tty_buffer *tail; /* Active buffer */ 79 struct tty_buffer *tail; /* Active buffer */