sched/wait: fix __wait_event_interruptible_lock_irq_timeout()
Subsystems (2)
PATCH 1/1 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.odrivers/s390/scsi/zfcp_qdio.c: In function 'zfcp_qdio_sbal_get':include/linux/wait.h:780:15: warning: 'ret' may be used uninitialized
__ret = schedule_timeout(__ret); \
^
drivers/s390/scsi/zfcp_qdio.c:245:7: note: 'ret' was declared here
long ret;
^--- include/linux/wait.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/wait.h +1 -1
@@ -775,7 +775,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));
Signature · 1 line
1.8.3.4
Quoted 8 lines · Heiko Carstens
__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.odrivers/s390/scsi/zfcp_qdio.c: In function 'zfcp_qdio_sbal_get':include/linux/wait.h:780:15: warning: 'ret' may be used uninitialized
Quoted 6 lines
__ret = schedule_timeout(__ret); \ ^ drivers/s390/scsi/zfcp_qdio.c:245:7: note: 'ret' was declared here long ret; ^Signed-off-by Heiko Carstens <[email protected]>
Urgh, sorry about that..
Quoted 20 lines
--- include/linux/wait.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/wait.h +1
-1@@ -775,7 +775,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));Signature · 1 line
1.8.3.4
tip-bot for Heiko Carstens
merge bot[tip:sched/core] sched/wait: Fix __wait_event_interruptible_lock_irq_timeout()
In reply to Heiko Carstenssched/wait: Fix __wait_event_interruptible_lock_irq_timeout()
Commit-ID: 7d716456a0ee4e9bd63be9234f886d20382ac950 Gitweb: http://git.kernel.org/tip/7d716456a0ee4e9bd63be9234f886d20382ac950 Author: Heiko Carstens <[email protected]> AuthorDate: Thu, 31 Oct 2013 12:48:14 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 1 Nov 2013 08:42:44 +0100
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
--- include/linux/wait.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/wait.h +1 -1
@@ -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));