aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-11-30 08:16:41 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 18:18:06 -0500
commit44e4909e453eaa09c7de409fc9ee4ebefd986c1c (patch)
tree5bad1ed70f24c7cedd61a7664afe3706abab4e2f /include/linux
parent1f100b323d19469b06a63ccd6130ed71760145cc (diff)
tty: tty_port: Change the buffer allocator locking
We want to be able to do this without regard for the activate/own open method being used which causes a problem using port->mutex. Add another mutex for now. Once everything uses port_open to do buffer allocs we can kill it back off Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/tty.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 6352ac257fcb..e9269ca1542a 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -212,6 +212,7 @@ struct tty_port {
212 wait_queue_head_t delta_msr_wait; /* Modem status change */ 212 wait_queue_head_t delta_msr_wait; /* Modem status change */
213 unsigned long flags; /* TTY flags ASY_*/ 213 unsigned long flags; /* TTY flags ASY_*/
214 struct mutex mutex; /* Locking */ 214 struct mutex mutex; /* Locking */
215 struct mutex buf_mutex; /* Buffer alloc lock */
215 unsigned char *xmit_buf; /* Optional buffer */ 216 unsigned char *xmit_buf; /* Optional buffer */
216 unsigned int close_delay; /* Close port delay */ 217 unsigned int close_delay; /* Close port delay */
217 unsigned int closing_wait; /* Delay for output */ 218 unsigned int closing_wait; /* Delay for output */