diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-03 23:32:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-03 23:32:12 -0700 |
| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a /drivers/tty/tty_buffer.c | |
| parent | 92ff71b8fe9cd9c673615fc6f3870af7376d7c84 (diff) | |
| parent | d8b0426af5b67973585712c9af36b86f6ea97815 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
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) atomic_inc(&buf->priority); mutex_lock(&buf->lock); } +EXPORT_SYMBOL_GPL(tty_buffer_lock_exclusive); void tty_buffer_unlock_exclusive(struct tty_port *port) { @@ -73,6 +74,7 @@ void tty_buffer_unlock_exclusive(struct tty_port *port) if (restart) queue_work(system_unbound_wq, &buf->work); } +EXPORT_SYMBOL_GPL(tty_buffer_unlock_exclusive); /** * tty_buffer_space_avail - return unused buffer space |