diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2013-06-15 09:36:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 19:47:08 -0400 |
commit | 7bfe0b7116be207cf2204ae06335cc89d8f8ee02 (patch) | |
tree | 03175cd2ce9dd8013c4aaa8e2dd426767aa1a4c7 /include/linux/tty.h | |
parent | 7391ee16950e772076d321792d9fbf030f921345 (diff) |
tty: Track flip buffer memory limit atomically
Lockless flip buffers require atomically updating the bytes-in-use
watermark.
The pty driver also peeks at the watermark value to limit
memory consumption to a much lower value than the default; query
the watermark with new fn, tty_buffer_space_avail().
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tty.h')
-rw-r--r-- | include/linux/tty.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 2e93eb831c61..7c124541f011 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h | |||
@@ -71,8 +71,7 @@ struct tty_bufhead { | |||
71 | struct tty_buffer *head; /* Queue head */ | 71 | struct tty_buffer *head; /* Queue head */ |
72 | struct tty_buffer *tail; /* Active buffer */ | 72 | struct tty_buffer *tail; /* Active buffer */ |
73 | struct llist_head free; /* Free queue head */ | 73 | struct llist_head free; /* Free queue head */ |
74 | int memory_used; /* Buffer space used excluding | 74 | atomic_t memory_used; /* In-use buffers excluding free list */ |
75 | free queue */ | ||
76 | }; | 75 | }; |
77 | /* | 76 | /* |
78 | * When a break, frame error, or parity error happens, these codes are | 77 | * When a break, frame error, or parity error happens, these codes are |