On Fri, 1 Mar 2013, liguang wrote: > Signed-off-by: liguang <lig.f...@cn.fujitsu.com>
Acked-by: Jiri Kosina <jkos...@suse.cz> Makes sense. Adding Andrew to CC. > --- > kernel/semaphore.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/kernel/semaphore.c b/kernel/semaphore.c > index 4567fc0..9c7017d 100644 > --- a/kernel/semaphore.c > +++ b/kernel/semaphore.c > @@ -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); > -- > 1.7.2.5 > -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/