diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 20:33:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 20:33:17 -0400 |
| commit | 7608a864e5211df1e3c1948e2719aec7c27b9333 (patch) | |
| tree | cd828f7b47731f90f4f9300130bc0977125d2a3c /drivers | |
| parent | 7713a7d195c2e11d7ba6a973317da0af862d1264 (diff) | |
| parent | f798634d806615bee27d1b83479034087a02aa0f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SERIAL] SUNHV: Fix jerky console on LDOM guests.
[SPARC64]: Fix race between MD update and dr-cpu add.
[SPARC64]: SMP build fix.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/sunhv.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index 17bcca53d6a1..d82be42ff29a 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c | |||
| @@ -258,17 +258,7 @@ static void sunhv_stop_tx(struct uart_port *port) | |||
| 258 | /* port->lock held by caller. */ | 258 | /* port->lock held by caller. */ |
| 259 | static void sunhv_start_tx(struct uart_port *port) | 259 | static void sunhv_start_tx(struct uart_port *port) |
| 260 | { | 260 | { |
| 261 | struct circ_buf *xmit = &port->info->xmit; | 261 | transmit_chars(port); |
| 262 | |||
| 263 | while (!uart_circ_empty(xmit)) { | ||
| 264 | long status = sun4v_con_putchar(xmit->buf[xmit->tail]); | ||
| 265 | |||
| 266 | if (status != HV_EOK) | ||
| 267 | break; | ||
| 268 | |||
| 269 | xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); | ||
| 270 | port->icount.tx++; | ||
| 271 | } | ||
| 272 | } | 262 | } |
| 273 | 263 | ||
| 274 | /* port->lock is not held. */ | 264 | /* port->lock is not held. */ |