diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-28 00:36:39 -0400 |
| commit | d35cc56ddfc948d8df1aa6d41ac345fcec01854d (patch) | |
| tree | 7e23a0e3dde639236e019aa88309d919941958e5 /include/linux/tty.h | |
| parent | 86d56134f1b67d0c18025ba5cade95c048ed528d (diff) | |
| parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) | |
Merge 3.15-rc3 into staging-next
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 1c3316a47d7e..036cccd80d9f 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
| @@ -61,6 +61,7 @@ struct tty_bufhead { | |||
| 61 | struct tty_buffer *head; /* Queue head */ | 61 | struct tty_buffer *head; /* Queue head */ |
| 62 | struct work_struct work; | 62 | struct work_struct work; |
| 63 | struct mutex lock; | 63 | struct mutex lock; |
| 64 | spinlock_t flush_lock; | ||
| 64 | atomic_t priority; | 65 | atomic_t priority; |
| 65 | struct tty_buffer sentinel; | 66 | struct tty_buffer sentinel; |
| 66 | struct llist_head free; /* Free queue head */ | 67 | struct llist_head free; /* Free queue head */ |