From 07f9cf7641bb4f77d2d812e7b12ef52eea14172e Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Wed, 6 Feb 2008 01:37:31 -0800 Subject: [PATCH] --- yaml --- r: 83448 b: refs/heads/master c: eb31005eaf3ca0705b404a78eb92f714c9449276 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_io.c | 1 - trunk/include/linux/tty.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 96af489953f5..eedf94507065 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d156042f9fdffcb0171dc20f0d8b6df3fbf779c4 +refs/heads/master: eb31005eaf3ca0705b404a78eb92f714c9449276 diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index c927f42c8e4d..b62bb67c3414 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -3721,7 +3721,6 @@ static void initialize_tty_struct(struct tty_struct *tty) tty->buf.head = tty->buf.tail = NULL; tty_buffer_init(tty); INIT_DELAYED_WORK(&tty->buf.work, flush_to_ldisc); - init_MUTEX(&tty->buf.pty_sem); mutex_init(&tty->termios_mutex); init_waitqueue_head(&tty->write_wait); init_waitqueue_head(&tty->read_wait); diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h index 402de892b3ed..5824a9777ad7 100644 --- a/trunk/include/linux/tty.h +++ b/trunk/include/linux/tty.h @@ -74,7 +74,6 @@ struct tty_buffer { struct tty_bufhead { struct delayed_work work; - struct semaphore pty_sem; spinlock_t lock; struct tty_buffer *head; /* Queue head */ struct tty_buffer *tail; /* Active buffer */