From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 2 Oct 2013 09:22:19 +0000 (+0200)
Subject: sched/wait: Change timeout logic
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~40^2~107
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2953ef246b058989657e1e77b36b67566ac06f7b;p=pandora-kernel.git

sched/wait: Change timeout logic

Commit 4c663cf ("wait: fix false timeouts when using
wait_event_timeout()") introduced an additional condition check after
a timeout but there's a few issues;

 - it forgot one site
 - it put the check after the main loop; not at the actual timeout
   check.

Cure both; by wrapping the condition (as suggested by Oleg), this
avoids double evaluation of 'condition' which could be quite big.

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20131002092528.028892896@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

Reading git-diff-tree failed