summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-05 15:50:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-05 15:50:16 -0700
commitdf862f625d62c8d5aef41361a8d21e4f55a0e748 (patch)
tree53dcd0ee8d44c9d186461dfd2d5cb4caa594e70d /include
parenta1e74464ffddf47e9a18f99a54242122bfd0997b (diff)
parent62a0d8d7c2b29f92850e4ee3c38e5dfd936e92b2 (diff)
downloadlinux-df862f625d62c8d5aef41361a8d21e4f55a0e748.tar.bz2
Merge tag 'tty-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fixes from Greg KH: "Here are some tty and serial driver fixes for things reported recently" * tag 'tty-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: tty: Fix lockless tty buffer race Revert "tty: Fix race condition between __tty_buffer_request_room and flush_to_ldisc" drivers/tty/hvc: don't free hvc_console_setup after init n_tty: Fix n_tty_write crash when echoing in raw mode tty: serial: 8250_core.c Bug fix for Exar chips.
Diffstat (limited to 'include')
-rw-r--r--include/linux/tty.h1
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 */