Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d716456 authored by Heiko Carstens's avatar Heiko Carstens Committed by Ingo Molnar
Browse files

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20131031114814.GB5551@osiris


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fb10d5b7

include/linux/wait.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -739,7 +739,7 @@ do { \ 
#define __wait_event_interruptible_lock_irq_timeout(wq, condition,	\

#define __wait_event_interruptible_lock_irq_timeout(wq, condition,	\

						    lock, timeout)	\

						    lock, timeout)	\

	___wait_event(wq, ___wait_cond_timeout(condition),		\

	___wait_event(wq, ___wait_cond_timeout(condition),		\

		      TASK_INTERRUPTIBLE, 0, ret,			\

		      TASK_INTERRUPTIBLE, 0, timeout,			\

		      spin_unlock_irq(&lock);				\

		      spin_unlock_irq(&lock);				\

		      __ret = schedule_timeout(__ret);			\

		      __ret = schedule_timeout(__ret);			\

		      spin_lock_irq(&lock));

		      spin_lock_irq(&lock));