[SERIAL] Fix up ARM serial drivers

This cset makes ARM serial drivers build.

drivers/serial/amba.c

@@ -231,7 +231,7 @@ static void ambauart_tx_chars(struct uart_port *port)
 		return;
 	}
 	if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-		ambauart_stop_tx(port);
+		ambauart_stop_tx(port, 0);
 		return;
 	}
 
@@ -248,7 +248,7 @@ static void ambauart_tx_chars(struct uart_port *port)
 		uart_write_wakeup(port);
 
 	if (uart_circ_empty(xmit))
-		ambauart_stop_tx(port);
+		ambauart_stop_tx(port, 0);
 }
 
 static void ambauart_modem_status(struct uart_port *port)

drivers/serial/anakin.c

@@ -69,7 +69,8 @@ anakin_transmit_buffer(struct uart_port *port)
 {
 	struct circ_buf *xmit = &port->info->xmit;
 
-	while (!(anakin_in(port, 0x10) & TXEMPTY));
+	while (!(anakin_in(port, 0x10) & TXEMPTY))
+		barrier();
 	anakin_out(port, 0x14, xmit->buf[xmit->tail]);
 	anakin_out(port, 0x18, anakin_in(port, 0x18) | SENDREQUEST);
 	xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE-1);
@@ -386,7 +387,8 @@ anakin_console_write(struct console *co, const char *s, unsigned int count)
 	 *	Now, do each character
 	 */
 	for (i = 0; i < count; i++, s++) {
-		while (!(anakin_in(port, 0x10) & TXEMPTY));
+		while (!(anakin_in(port, 0x10) & TXEMPTY))
+			barrier();
 
 		/*
 		 *	Send the character out.
@@ -396,7 +398,8 @@ anakin_console_write(struct console *co, const char *s, unsigned int count)
 		anakin_out(port, 0x18, anakin_in(port, 0x18) | SENDREQUEST);
 
 		if (*s == 10) {
-			while (!(anakin_in(port, 0x10) & TXEMPTY));
+			while (!(anakin_in(port, 0x10) & TXEMPTY))
+				barrier();
 			anakin_out(port, 0x14, 13);
 			anakin_out(port, 0x18, anakin_in(port, 0x18)
 					| SENDREQUEST);
@@ -407,7 +410,8 @@ anakin_console_write(struct console *co, const char *s, unsigned int count)
 	 *	Finally, wait for transmitter to become empty
 	 *	and restore the interrupts
 	 */
-	while (!(anakin_in(port, 0x10) & TXEMPTY));
+	while (!(anakin_in(port, 0x10) & TXEMPTY))
+		barrier();
 
 	if (status & IRQENABLE) {
 		local_irq_save(flags);

drivers/serial/clps711x.c

@@ -193,7 +193,7 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
 		return;
 	}
 	if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
-		clps711xuart_stop_tx(port);
+		clps711xuart_stop_tx(port, 0);
 		return;
 	}
 
@@ -210,7 +210,7 @@ static void clps711xuart_int_tx(int irq, void *dev_id, struct pt_regs *regs)
 		uart_write_wakeup(port);
 
 	if (uart_circ_empty(xmit))
-		clps711xuart_stop_tx(port);
+		clps711xuart_stop_tx(port, 0);
 }
 
 static unsigned int clps711xuart_tx_empty(struct uart_port *port)
@@ -425,6 +425,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
 		.uartclk	= 3686400,
 		.fifosize	= 16,
 		.ops		= &clps711x_pops,
+		.line		= 0,
 		.flags		= ASYNC_BOOT_AUTOCONF,
 	},
 	{
@@ -433,6 +434,7 @@ static struct uart_port clps711x_ports[UART_NR] = {
 		.uartclk	= 3686400,
 		.fifosize	= 16,
 		.ops		= &clps711x_pops,
+		.line		= 1,
 		.flags		= ASYNC_BOOT_AUTOCONF,
 	}
 };

drivers/serial/uart00.c

@@ -193,7 +193,8 @@ static void uart00_tx_chars(struct uart_port *port)
 	int count;
 
 	if (port->x_char) {
-		while ((UART_GET_TSR(port) & UART_TSR_TX_LEVEL_MSK) == 15);
+		while ((UART_GET_TSR(port) & UART_TSR_TX_LEVEL_MSK) == 15)
+			barrier();
 		UART_PUT_CHAR(port, port->x_char);
 		port->icount.tx++;
 		port->x_char = 0;
@@ -206,7 +207,8 @@ static void uart00_tx_chars(struct uart_port *port)
 
 	count = port->fifosize >> 1;
 	do {
-		while ((UART_GET_TSR(port) & UART_TSR_TX_LEVEL_MSK) == 15);
+		while ((UART_GET_TSR(port) & UART_TSR_TX_LEVEL_MSK) == 15)
+			barrier();
 		UART_PUT_CHAR(port, xmit->buf[xmit->tail]);
 		xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
 		port->icount.tx++;