diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2006-10-01 02:28:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:24 -0400 |
commit | 6e9a4738c9fadb7cbdcabc1e3b415159f3741ed9 (patch) | |
tree | 0e470bb8cd431d59698da5a6999ff35a347619a3 /drivers/scsi | |
parent | 397d6140e93156ecb9cafcd9be0db10ff3c12ab3 (diff) |
[PATCH] completions: lockdep annotate on stack completions
All on stack DECLARE_COMPLETIONs should be replaced by:
DECLARE_COMPLETION_ONSTACK
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/53c700.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 4 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 | ||||
-rw-r--r-- | drivers/scsi/gdth.c | 4 | ||||
-rw-r--r-- | drivers/scsi/qla1280.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index 657a3ab75399..15ce40a7053a 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c | |||
@@ -1939,7 +1939,7 @@ NCR_700_abort(struct scsi_cmnd * SCp) | |||
1939 | STATIC int | 1939 | STATIC int |
1940 | NCR_700_bus_reset(struct scsi_cmnd * SCp) | 1940 | NCR_700_bus_reset(struct scsi_cmnd * SCp) |
1941 | { | 1941 | { |
1942 | DECLARE_COMPLETION(complete); | 1942 | DECLARE_COMPLETION_ONSTACK(complete); |
1943 | struct NCR_700_Host_Parameters *hostdata = | 1943 | struct NCR_700_Host_Parameters *hostdata = |
1944 | (struct NCR_700_Host_Parameters *)SCp->device->host->hostdata[0]; | 1944 | (struct NCR_700_Host_Parameters *)SCp->device->host->hostdata[0]; |
1945 | 1945 | ||
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index c7eeaced324a..1faa008b5b81 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -646,7 +646,7 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd) | |||
646 | struct ahd_initiator_tinfo *tinfo; | 646 | struct ahd_initiator_tinfo *tinfo; |
647 | struct ahd_tmode_tstate *tstate; | 647 | struct ahd_tmode_tstate *tstate; |
648 | unsigned long flags; | 648 | unsigned long flags; |
649 | DECLARE_COMPLETION(done); | 649 | DECLARE_COMPLETION_ONSTACK(done); |
650 | 650 | ||
651 | reset_scb = NULL; | 651 | reset_scb = NULL; |
652 | paused = FALSE; | 652 | paused = FALSE; |
@@ -2251,7 +2251,7 @@ done: | |||
2251 | if (paused) | 2251 | if (paused) |
2252 | ahd_unpause(ahd); | 2252 | ahd_unpause(ahd); |
2253 | if (wait) { | 2253 | if (wait) { |
2254 | DECLARE_COMPLETION(done); | 2254 | DECLARE_COMPLETION_ONSTACK(done); |
2255 | 2255 | ||
2256 | ahd->platform_data->eh_done = &done; | 2256 | ahd->platform_data->eh_done = &done; |
2257 | ahd_unlock(ahd, &flags); | 2257 | ahd_unlock(ahd, &flags); |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 64c8b88a429f..339b85cb61cd 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -2335,7 +2335,7 @@ done: | |||
2335 | if (paused) | 2335 | if (paused) |
2336 | ahc_unpause(ahc); | 2336 | ahc_unpause(ahc); |
2337 | if (wait) { | 2337 | if (wait) { |
2338 | DECLARE_COMPLETION(done); | 2338 | DECLARE_COMPLETION_ONSTACK(done); |
2339 | 2339 | ||
2340 | ahc->platform_data->eh_done = &done; | 2340 | ahc->platform_data->eh_done = &done; |
2341 | ahc_unlock(ahc, &flags); | 2341 | ahc_unlock(ahc, &flags); |
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index 43afd476e606..0f3eb22b979a 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
@@ -724,7 +724,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, | |||
724 | int timeout, u32 *info) | 724 | int timeout, u32 *info) |
725 | { | 725 | { |
726 | Scsi_Cmnd *scp; | 726 | Scsi_Cmnd *scp; |
727 | DECLARE_COMPLETION(wait); | 727 | DECLARE_COMPLETION_ONSTACK(wait); |
728 | int rval; | 728 | int rval; |
729 | 729 | ||
730 | scp = kmalloc(sizeof(*scp), GFP_KERNEL); | 730 | scp = kmalloc(sizeof(*scp), GFP_KERNEL); |
@@ -764,7 +764,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, | |||
764 | { | 764 | { |
765 | Scsi_Cmnd *scp = scsi_allocate_device(sdev, 1, FALSE); | 765 | Scsi_Cmnd *scp = scsi_allocate_device(sdev, 1, FALSE); |
766 | unsigned bufflen = gdtcmd ? sizeof(gdth_cmd_str) : 0; | 766 | unsigned bufflen = gdtcmd ? sizeof(gdth_cmd_str) : 0; |
767 | DECLARE_COMPLETION(wait); | 767 | DECLARE_COMPLETION_ONSTACK(wait); |
768 | int rval; | 768 | int rval; |
769 | 769 | ||
770 | if (!scp) | 770 | if (!scp) |
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 8953991462d7..332151e2a018 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
@@ -813,7 +813,7 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action) | |||
813 | uint16_t data; | 813 | uint16_t data; |
814 | unsigned char *handle; | 814 | unsigned char *handle; |
815 | int result, i; | 815 | int result, i; |
816 | DECLARE_COMPLETION(wait); | 816 | DECLARE_COMPLETION_ONSTACK(wait); |
817 | struct timer_list timer; | 817 | struct timer_list timer; |
818 | 818 | ||
819 | ha = (struct scsi_qla_host *)(CMD_HOST(cmd)->hostdata); | 819 | ha = (struct scsi_qla_host *)(CMD_HOST(cmd)->hostdata); |
@@ -2406,7 +2406,7 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb) | |||
2406 | uint16_t *optr, *iptr; | 2406 | uint16_t *optr, *iptr; |
2407 | uint16_t __iomem *mptr; | 2407 | uint16_t __iomem *mptr; |
2408 | uint16_t data; | 2408 | uint16_t data; |
2409 | DECLARE_COMPLETION(wait); | 2409 | DECLARE_COMPLETION_ONSTACK(wait); |
2410 | struct timer_list timer; | 2410 | struct timer_list timer; |
2411 | 2411 | ||
2412 | ENTER("qla1280_mailbox_command"); | 2412 | ENTER("qla1280_mailbox_command"); |