From f868a0d2ba68df12e7897cd79c48cd9e447838c3 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Fri, 8 Feb 2008 04:21:02 -0800 Subject: [PATCH] --- yaml --- r: 84762 b: refs/heads/master c: 829dd8112274d46c5ed82d46be506762e2c8fcd8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/atmel_serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d39781ed3147..cd358d689b1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b843aa216c4da250c6732cd76430d73a6589beb5 +refs/heads/master: 829dd8112274d46c5ed82d46be506762e2c8fcd8 diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c index bb9c3574caa9..4d1ccc2b762d 100644 --- a/trunk/drivers/serial/atmel_serial.c +++ b/trunk/drivers/serial/atmel_serial.c @@ -615,7 +615,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, imr = UART_GET_IMR(port); UART_PUT_IDR(port, -1); while (!(UART_GET_CSR(port) & ATMEL_US_TXEMPTY)) - barrier(); + cpu_relax(); /* disable receiver and transmitter */ UART_PUT_CR(port, ATMEL_US_TXDIS | ATMEL_US_RXDIS); @@ -794,7 +794,7 @@ void __init atmel_register_uart_fns(struct atmel_port_fns *fns) static void atmel_console_putchar(struct uart_port *port, int ch) { while (!(UART_GET_CSR(port) & ATMEL_US_TXRDY)) - barrier(); + cpu_relax(); UART_PUT_CHAR(port, ch); }