From b99445380620aa5ed2acb93ec0ae603cbd80fdd2 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 10 Oct 2006 22:47:47 +0100
Subject: [PATCH] --- yaml --- r: 39233 b: refs/heads/master c:
 fa1f5ea860af34d74c1475eddde3364e71fac15d h: refs/heads/master i:   39231:
 fb14e08ead185a2ad7a5f521e5c42ee3c4d5ea75 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/scsi/scsi_error.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 22e1f2d2a5c6..eb0525af9595 100644
--- 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
index 3d355d054612..aff1b0cfd4b2 100644
--- 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;