From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 10 Oct 2006 21:47:47 +0000 (+0100)
Subject: [PATCH] gfp annotations: scsi_error
X-Git-Tag: v2.6.19-rc2~174
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fa1f5ea860af34d74c1475eddde3364e71fac15d;p=linux-2.6-omap-h63xx.git

[PATCH] gfp annotations: scsi_error

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 3d355d05461..aff1b0cfd4b 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -495,7 +495,7 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
 	memcpy(scmd->cmnd, cmnd, cmnd_size);
 
 	if (copy_sense) {
-		int gfp_mask = GFP_ATOMIC;
+		gfp_t gfp_mask = GFP_ATOMIC;
 
 		if (shost->hostt->unchecked_isa_dma)
 			gfp_mask |= __GFP_DMA;