From: Oleg Nesterov Date: Mon, 7 Oct 2013 18:31:06 +0000 (+0200) Subject: sched/wait: Add ___wait_cond_timeout() to wait_event*_timeout() too X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~40^2~18 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8922915b38cd8b72f8e5af614b95be71d1d299d4;p=pandora-kernel.git sched/wait: Add ___wait_cond_timeout() to wait_event*_timeout() too Commit 4c663cfc ("wait: fix false timeouts when using wait_event_timeout()") introduced the additional condition checks after a timeout but only in the "slow" __wait*() paths. wait_event_timeout(wq, CONDITION, 0) still returns 0 if CONDITION is already true and we do not call __wait*(). Now that we have ___wait_cond_timeout() we can use it instead to ensure that __ret will be properly updated. Signed-off-by: Oleg Nesterov Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/20131007183106.GA10973@redhat.com Signed-off-by: Ingo Molnar --- Reading git-diff-tree failed