diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 13:06:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:48 -0400 |
commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /drivers/tty | |
parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (diff) |
arch: Mass conversion of smp_mb__*()
Mostly scripted conversion of the smp_mb__* barriers.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-55dhyhocezdw1dg7u19hmh1u@git.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/n_tty.c | 2 | ||||
-rw-r--r-- | drivers/tty/serial/mxs-auart.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 41fe8a047d37..746ae80b972f 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c | |||
@@ -2041,7 +2041,7 @@ static int canon_copy_from_read_buf(struct tty_struct *tty, | |||
2041 | 2041 | ||
2042 | if (found) | 2042 | if (found) |
2043 | clear_bit(eol, ldata->read_flags); | 2043 | clear_bit(eol, ldata->read_flags); |
2044 | smp_mb__after_clear_bit(); | 2044 | smp_mb__after_atomic(); |
2045 | ldata->read_tail += c; | 2045 | ldata->read_tail += c; |
2046 | 2046 | ||
2047 | if (found) { | 2047 | if (found) { |
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index aa97fd845b4d..4b5b3c2fe328 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c | |||
@@ -200,7 +200,7 @@ static void dma_tx_callback(void *param) | |||
200 | 200 | ||
201 | /* clear the bit used to serialize the DMA tx. */ | 201 | /* clear the bit used to serialize the DMA tx. */ |
202 | clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags); | 202 | clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags); |
203 | smp_mb__after_clear_bit(); | 203 | smp_mb__after_atomic(); |
204 | 204 | ||
205 | /* wake up the possible processes. */ | 205 | /* wake up the possible processes. */ |
206 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | 206 | if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) |
@@ -275,7 +275,7 @@ static void mxs_auart_tx_chars(struct mxs_auart_port *s) | |||
275 | mxs_auart_dma_tx(s, i); | 275 | mxs_auart_dma_tx(s, i); |
276 | } else { | 276 | } else { |
277 | clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags); | 277 | clear_bit(MXS_AUART_DMA_TX_SYNC, &s->flags); |
278 | smp_mb__after_clear_bit(); | 278 | smp_mb__after_atomic(); |
279 | } | 279 | } |
280 | return; | 280 | return; |
281 | } | 281 | } |