diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-09-10 15:06:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-23 21:19:35 -0700 |
| commit | d01f4d181c92877ecc678adce248a30cb7077ff1 (patch) | |
| tree | f4b9a5723be98e63e2b238f8290fd418179a238a /include/linux/serial_core.h | |
| parent | 317c1360200059a7a8a832294a58409c73b784bf (diff) | |
| download | linux-d01f4d181c92877ecc678adce248a30cb7077ff1.tar.gz linux-d01f4d181c92877ecc678adce248a30cb7077ff1.tar.bz2 linux-d01f4d181c92877ecc678adce248a30cb7077ff1.zip | |
serial: core: Privatize tty->hw_stopped
tty->hw_stopped is not used by the tty core and is thread-unsafe;
hw_stopped is a member of a bitfield whose fields are updated
non-atomically and no lock is suitable for serializing updates.
Replace serial core usage of tty->hw_stopped with uport->hw_stopped.
Use int storage which works around Alpha EV4/5 non-atomic byte storage,
since uart_port uses different locks to protect certain fields within the
structure.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/serial_core.h')
| -rw-r--r-- | include/linux/serial_core.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 452c9cc9d717..204c452a7567 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -197,6 +197,7 @@ struct uart_port { #define UPSTAT_CTS_ENABLE ((__force upstat_t) (1 << 0)) #define UPSTAT_DCD_ENABLE ((__force upstat_t) (1 << 1)) + int hw_stopped; /* sw-assisted CTS flow state */ unsigned int mctrl; /* current modem ctrl settings */ unsigned int timeout; /* character-based timeout */ unsigned int type; /* port type */ @@ -357,7 +358,7 @@ int uart_resume_port(struct uart_driver *reg, struct uart_port *port); static inline int uart_tx_stopped(struct uart_port *port) { struct tty_struct *tty = port->state->port.tty; - if(tty->stopped || tty->hw_stopped) + if (tty->stopped || port->hw_stopped) return 1; return 0; } |