---

yaml --- r: 39233 b: refs/heads/master c: fa1f5ea h: refs/heads/master i: 39231: fb14e08 v: v3
git-mirror · Oct 10, 2006 · b994453 · b994453
1 parent f8b3d63
commit b994453
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86f93336543314ffc46787845b631029cf11d6f8
+refs/heads/master: fa1f5ea860af34d74c1475eddde3364e71fac15d
diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/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;