diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 02:33:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 02:33:17 +0200 |
| commit | 7608a864e5211df1e3c1948e2719aec7c27b9333 (patch) | |
| tree | cd828f7b47731f90f4f9300130bc0977125d2a3c /drivers | |
| parent | [HRTIMER] Fix cpu pointer arg to clockevents_notify() (diff) | |
| parent | [SERIAL] SUNHV: Fix jerky console on LDOM guests. (diff) | |
| download | linux-7608a864e5211df1e3c1948e2719aec7c27b9333.tar.xz linux-7608a864e5211df1e3c1948e2719aec7c27b9333.zip | |
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) /* port->lock held by caller. */ static void sunhv_start_tx(struct uart_port *port) { - struct circ_buf *xmit = &port->info->xmit; - - while (!uart_circ_empty(xmit)) { - long status = sun4v_con_putchar(xmit->buf[xmit->tail]); - - if (status != HV_EOK) - break; - - xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); - port->icount.tx++; - } + transmit_chars(port); } /* port->lock is not held. */ |