summaryrefslogtreecommitdiffstats
path: root/include/linux/wait.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-10-31 12:48:14 +0100
committerIngo Molnar <mingo@kernel.org>2013-11-01 08:42:44 +0100
commit7d716456a0ee4e9bd63be9234f886d20382ac950 (patch)
tree0ec8e4fec5a032be9db2a2337d4bd20db9d7b005 /include/linux/wait.h
parentfb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a (diff)
downloadlinux-stable-7d716456a0ee4e9bd63be9234f886d20382ac950.tar.gz
linux-stable-7d716456a0ee4e9bd63be9234f886d20382ac950.tar.bz2
linux-stable-7d716456a0ee4e9bd63be9234f886d20382ac950.zip
sched/wait: Fix __wait_event_interruptible_lock_irq_timeout()
__wait_event_interruptible_lock_irq_timeout() needs the timeout parameter passed instead of "ret". This magically compiled since the only user has a local ret variable. Luckily we got a build warning: CC drivers/s390/scsi/zfcp_qdio.o drivers/s390/scsi/zfcp_qdio.c: In function 'zfcp_qdio_sbal_get': include/linux/wait.h:780:15: warning: 'ret' may be used uninitialized Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20131031114814.GB5551@osiris Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/wait.h')
-rw-r--r--include/linux/wait.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 3b23afa04d6b..61939ba30aa0 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -739,7 +739,7 @@ do { \
#define __wait_event_interruptible_lock_irq_timeout(wq, condition, \
lock, timeout) \
___wait_event(wq, ___wait_cond_timeout(condition), \
- TASK_INTERRUPTIBLE, 0, ret, \
+ TASK_INTERRUPTIBLE, 0, timeout, \
spin_unlock_irq(&lock); \
__ret = schedule_timeout(__ret); \
spin_lock_irq(&lock));