diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-30 13:36:49 -0400 |
| commit | fced6dee29f6fb143fe16ea90331176ff77e6120 (patch) | |
| tree | 5b6e57e7a757adc2a6518ce291a4d2914397b917 /include/linux/tty.h | |
| parent | bfed1074f213051e94648bfad0d0611a16d81366 (diff) | |
| parent | be1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff) | |
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
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 */ |