diff options
author | Frank Munzert <munzert@de.ibm.com> | 2009-09-11 04:28:39 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-09-11 04:29:46 -0400 |
commit | 6292b9ef5a4e85d6b782412a85725dd38df24b85 (patch) | |
tree | 6e38da48f3763ab18d6807f3c8d931886dac80b5 | |
parent | c6304933274f8e3cc6983d496456757ac8ab2e0b (diff) |
[S390] tape: use init_timer_on_stack() rather than init_timer()
With CONFIG_DEBUG_OBJECTS_TIMERS=y "chccwdev --online" for a tape device
will fail with message "ODEBUG: object is on stack, but not annotated".
We now use init_timer_on_stack.
Signed-off-by: Frank Munzert <munzert@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | drivers/s390/char/tape_std.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c index 1a9420ba518d..750354ad16e5 100644 --- a/drivers/s390/char/tape_std.c +++ b/drivers/s390/char/tape_std.c | |||
@@ -68,7 +68,7 @@ tape_std_assign(struct tape_device *device) | |||
68 | * to another host (actually this shouldn't happen but it does). | 68 | * to another host (actually this shouldn't happen but it does). |
69 | * So we set up a timeout for this call. | 69 | * So we set up a timeout for this call. |
70 | */ | 70 | */ |
71 | init_timer(&timeout); | 71 | init_timer_on_stack(&timeout); |
72 | timeout.function = tape_std_assign_timeout; | 72 | timeout.function = tape_std_assign_timeout; |
73 | timeout.data = (unsigned long) request; | 73 | timeout.data = (unsigned long) request; |
74 | timeout.expires = jiffies + 2 * HZ; | 74 | timeout.expires = jiffies + 2 * HZ; |