commit 45849282bfd7543253761cbf7db96151b05e5ed1
author Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Apr 26 15:29:44 2005 +0100
committer Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Apr 26 15:29:44 2005 +0100
tree 1e02a8874f487041795f27427d2ee22e8c236c8c
parent b453257f057b834fdf9f4a6ad6133598b79bd982

[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>

drivers/serial/s3c2410.c

diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index bd6782a..435750d 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -364,7 +364,7 @@
 		flag = TTY_NORMAL;
 		port->icount.rx++;
 
-		if (uerstat & S3C2410_UERSTAT_ANY) {
+		if (unlikely(uerstat & S3C2410_UERSTAT_ANY)) {
 			dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n",
 			    ch, uerstat);