diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-05-02 10:56:11 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-03 18:14:28 -0400 |
| commit | 5fbf1a65dd53ef313783c34a0e93a6e29def6136 (patch) | |
| tree | e4631779d08d03cd27d0b4a5546e4a5768a77ead /include | |
| parent | 501fed45b7e8836ee9373f4d31e2d85e3db6103a (diff) | |
| download | linux-stable-5fbf1a65dd53ef313783c34a0e93a6e29def6136.tar.gz linux-stable-5fbf1a65dd53ef313783c34a0e93a6e29def6136.tar.bz2 linux-stable-5fbf1a65dd53ef313783c34a0e93a6e29def6136.zip | |
Revert "tty: Fix race condition between __tty_buffer_request_room and flush_to_ldisc"
This reverts commit 6a20dbd6caa2358716136144bf524331d70b1e03.
Although the commit correctly identifies an unsafe race condition
between __tty_buffer_request_room() and flush_to_ldisc(), the commit
fixes the race with an unnecessary spinlock in a lockless algorithm.
The follow-on commit, "tty: Fix lockless tty buffer race" fixes
the race locklessly.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 036cccd80d9f..1c3316a47d7e 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -61,7 +61,6 @@ struct tty_bufhead { struct tty_buffer *head; /* Queue head */ struct work_struct work; struct mutex lock; - spinlock_t flush_lock; atomic_t priority; struct tty_buffer sentinel; struct llist_head free; /* Free queue head */ |