semaphore: use unlikely() for down's timeout
authorliguang <[email protected]>
Tue, 30 Apr 2013 22:28:32 +0000 (15:28 -0700)
committerLinus Torvalds <[email protected]>
Wed, 1 May 2013 00:04:08 +0000 (17:04 -0700)
Signed-off-by: liguang <[email protected]>
Cc: Jiri Kosina <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
kernel/semaphore.c

index 4567fc020fe343970e0cb09c53aed567531be703..9c7017d1d99695b7767b2471843f6e63c7fa0e75 100644 (file)
@@ -214,7 +214,7 @@ static inline int __sched __down_common(struct semaphore *sem, long state,
        for (;;) {
                if (signal_pending_state(state, task))
                        goto interrupted;
-               if (timeout <= 0)
+               if (unlikely(timeout <= 0))
                        goto timed_out;
                __set_task_state(task, state);
                raw_spin_unlock_irq(&sem->lock);