summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_ioctl.c
diff options
context:
space:
mode:
authorAl Viro2005-10-21 09:22:08 +0200
committerLinus Torvalds2005-10-28 17:16:50 +0200
commitc53033f6b0bd7cc133b7f433083f0394cf29ac70 (patch)
tree0e53b6f65b41f69de987e6b2a96248218933d497 /drivers/scsi/scsi_ioctl.c
parent[PATCH] gfp_t: kernel/* (diff)
downloadkernel-qcow2-linux-c53033f6b0bd7cc133b7f433083f0394cf29ac70.tar.gz
kernel-qcow2-linux-c53033f6b0bd7cc133b7f433083f0394cf29ac70.tar.xz
kernel-qcow2-linux-c53033f6b0bd7cc133b7f433083f0394cf29ac70.zip
[PATCH] gfp_t: drivers/scsi
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/scsi_ioctl.c')
-rw-r--r--drivers/scsi/scsi_ioctl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index de7f98cc38fe..6a3f6aae8a97 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -205,7 +205,8 @@ int scsi_ioctl_send_command(struct scsi_device *sdev,
unsigned int inlen, outlen, cmdlen;
unsigned int needed, buf_needed;
int timeout, retries, result;
- int data_direction, gfp_mask = GFP_KERNEL;
+ int data_direction;
+ gfp_t gfp_mask = GFP_KERNEL;
if (!sic)
return -EINVAL;