From 45849282bfd7543253761cbf7db96151b05e5ed1 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 26 Apr 2005 15:29:44 +0100 Subject: [PATCH] Serial: Ensure error paths are marked with unlikely() Ensure ARM serial driver error paths are marked with the unlikely() compiler hint. Signed-off-by: Russell King --- drivers/serial/amba-pl011.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/serial/amba-pl011.c') diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index ff658a8..d5cbef3 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -137,7 +137,7 @@ pl011_rx_chars(struct uart_amba_port *uap) * out of the main execution path */ rsr = readw(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX; - if (rsr & UART01x_RSR_ANY) { + if (unlikely(rsr & UART01x_RSR_ANY)) { if (rsr & UART01x_RSR_BE) { rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE); uap->port.icount.brk++; -- cgit v1.1