diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /drivers/tty/tty_buffer.c | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'drivers/tty/tty_buffer.c')
| -rw-r--r-- | drivers/tty/tty_buffer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c index cf78d1985cd8..143deb62467d 100644 --- a/drivers/tty/tty_buffer.c +++ b/drivers/tty/tty_buffer.c | |||
| @@ -60,6 +60,7 @@ void tty_buffer_lock_exclusive(struct tty_port *port) | |||
| 60 | atomic_inc(&buf->priority); | 60 | atomic_inc(&buf->priority); |
| 61 | mutex_lock(&buf->lock); | 61 | mutex_lock(&buf->lock); |
| 62 | } | 62 | } |
| 63 | EXPORT_SYMBOL_GPL(tty_buffer_lock_exclusive); | ||
| 63 | 64 | ||
| 64 | void tty_buffer_unlock_exclusive(struct tty_port *port) | 65 | void tty_buffer_unlock_exclusive(struct tty_port *port) |
| 65 | { | 66 | { |
| @@ -73,6 +74,7 @@ void tty_buffer_unlock_exclusive(struct tty_port *port) | |||
| 73 | if (restart) | 74 | if (restart) |
| 74 | queue_work(system_unbound_wq, &buf->work); | 75 | queue_work(system_unbound_wq, &buf->work); |
| 75 | } | 76 | } |
| 77 | EXPORT_SYMBOL_GPL(tty_buffer_unlock_exclusive); | ||
| 76 | 78 | ||
| 77 | /** | 79 | /** |
| 78 | * tty_buffer_space_avail - return unused buffer space | 80 | * tty_buffer_space_avail - return unused buffer space |
