Commit:     829dd8112274d46c5ed82d46be506762e2c8fcd8
Parent:     b843aa216c4da250c6732cd76430d73a6589beb5
Author:     Haavard Skinnemoen <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 04:21:02 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 09:22:37 2008 -0800

    atmel_serial: use cpu_relax() when busy-waiting
    Replace two instances of barrier() with cpu_relax() since that's the right
    thing to do when busy-waiting.  This does not actually change anything since
    cpu_relax() is defined as barrier() on both ARM and AVR32.
    Signed-off-by: Haavard Skinnemoen <[EMAIL PROTECTED]>
    Acked-by: Andrew Victor <[EMAIL PROTECTED]>
    Tested-by: Marc Pignat <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/serial/atmel_serial.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index bb9c357..4d1ccc2 100644
--- a/drivers/serial/atmel_serial.c
+++ b/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 */
@@ -794,7 +794,7 @@ void __init atmel_register_uart_fns(struct atmel_port_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);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to