diff options
| author | Meelis Roos <mroos@linux.ee> | 2013-11-29 11:05:47 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-12-19 20:56:28 -0800 |
| commit | 762a86a901417280b2af9e2004f05d7481f30441 (patch) | |
| tree | c9de0977498919cbc79459dc406fdf3b19959e8c /drivers/scsi | |
| parent | 8e5cf31b1cc8ca6d38a0a83dafc1134d35a25e6f (diff) | |
| download | blackbird-obmc-linux-762a86a901417280b2af9e2004f05d7481f30441.tar.gz blackbird-obmc-linux-762a86a901417280b2af9e2004f05d7481f30441.zip | |
[SCSI] qla1280: Annotate timer on stack so object debug does not complain
Object Debug option in 3.13-rc1 resultsin the following warning, cure
it by annotating the timer to be on stack. The timer is deleted in the
same function so stack seems OK.
ODEBUG: object is on stack, but not annotated
------------[ cut here ]------------
WARNING: CPU: 6 PID: 18 at lib/debugobjects.c:300 __debug_object_init+0x184/0x240()
Modules linked in:
CPU: 6 PID: 18 Comm: kworker/u4:1 Tainted: G W 3.13.0-rc1 #16
Workqueue: events_unbound async_run_entry_fn
Call Trace:
[00000000004585cc] warn_slowpath_common+0x4c/0x80
[0000000000458614] warn_slowpath_null+0x14/0x40
[000000000063d524] __debug_object_init+0x184/0x240
[000000000063d5fc] debug_object_init+0x1c/0x40
[00000000004645ec] init_timer_key+0xc/0x60
[00000000006cca60] qla1280_mailbox_command+0xc0/0x2a0
[00000000006ccdd4] qla1280_set_target_parameters+0x194/0x220
[00000000006cd324] qla1280_slave_configure+0x384/0x3c0
[00000000006a5d48] scsi_add_lun+0x5c8/0x640
[00000000006a62b8] scsi_probe_and_add_lun+0x1b8/0x2e0
[00000000006a6c2c] __scsi_scan_target+0x8c/0x100
[00000000006a6cf4] scsi_scan_channel+0x54/0xa0
[00000000006a7008] scsi_scan_host_selected+0xc8/0x120
[00000000006a70e0] do_scsi_scan_host+0x80/0xa0
[00000000006a7164] do_scan_async+0x4/0x20
[00000000004817b8] async_run_entry_fn+0x58/0x120
---[ end trace 9a1420108ebfd590 ]---
Signed-off-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla1280.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 5a522c5bbd43..97dabd39b092 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -2502,7 +2502,7 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb) /* Issue set host interrupt command. */ /* set up a timer just in case we're really jammed */ - init_timer(&timer); + init_timer_on_stack(&timer); timer.expires = jiffies + 20*HZ; timer.data = (unsigned long)ha; timer.function = qla1280_mailbox_timeout; |
