summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-10 22:47:47 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-10 15:37:23 -0700
commitfa1f5ea860af34d74c1475eddde3364e71fac15d (patch)
treee52736f361bea819db6750a372ba27e0f1a43f24
parent86f93336543314ffc46787845b631029cf11d6f8 (diff)
downloadlinux-fa1f5ea860af34d74c1475eddde3364e71fac15d.tar.bz2
[PATCH] gfp annotations: scsi_error
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/scsi/scsi_error.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 3d355d054612..aff1b0cfd4b2 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;