From: Stefan Richter Date: Wed, 13 Sep 2006 03:35:54 +0000 (-0700) Subject: [PATCH] SCSI: lockdep annotation in scsi_send_eh_cmnd X-Git-Tag: v2.6.18~13^2~19 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7fbb36451a91de6e8f9ece4f1f1ee9bd8ebf838a;p=linux-2.6-omap-h63xx.git [PATCH] SCSI: lockdep annotation in scsi_send_eh_cmnd Fixup for lockdep enabled kernels: Annotate an on-stack completion. Signed-off-by: Stefan Richter Acked-by: Ingo Molnar Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index a8ed5a22009..3d355d05461 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -466,7 +466,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd, struct scsi_device *sdev = scmd->device; struct Scsi_Host *shost = sdev->host; int old_result = scmd->result; - DECLARE_COMPLETION(done); + DECLARE_COMPLETION_ONSTACK(done); unsigned long timeleft; unsigned long flags; unsigned char old_cmnd[MAX_COMMAND_SIZE];