diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-04-26 15:29:44 +0100 |
|---|---|---|
| committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-04-26 15:29:44 +0100 |
| commit | 45849282bfd7543253761cbf7db96151b05e5ed1 (patch) | |
| tree | 1e02a8874f487041795f27427d2ee22e8c236c8c /drivers/serial/amba-pl010.c | |
| parent | [PATCH] kill gratitious includes of major.h under net/* (diff) | |
| download | linux-dev-45849282bfd7543253761cbf7db96151b05e5ed1.tar.xz linux-dev-45849282bfd7543253761cbf7db96151b05e5ed1.zip | |
[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 <rmk@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/amba-pl010.c')
| -rw-r--r-- | drivers/serial/amba-pl010.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index 484f6fb900b5..f2a5e2933c47 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c @@ -172,7 +172,7 @@ pl010_rx_chars(struct uart_port *port) * out of the main execution path */ rsr = UART_GET_RSR(port) | 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); port->icount.brk++; |