From 1cf14f18b20483e93b022908f0cf43032639cf30 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 1 Feb 2006 06:30:45 -0500
Subject: [PATCH] --- yaml --- r: 20046 b: refs/heads/master c:
 e5fb81bd895041230dfaeb8f8f498b85b4705988 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6ee6b28821be..9cbded400704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaedd944d4dd25fdfafb10db65544e98eb66857d
+refs/heads/master: e5fb81bd895041230dfaeb8f8f498b85b4705988
diff --git a/trunk/drivers/scsi/scsi_transport_iscsi.c b/trunk/drivers/scsi/scsi_transport_iscsi.c
index 59a1c9d9d3bd..723f7acbeb12 100644
--- a/trunk/drivers/scsi/scsi_transport_iscsi.c
+++ b/trunk/drivers/scsi/scsi_transport_iscsi.c
@@ -463,7 +463,7 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb)
 }
 
 static void*
-mempool_zone_alloc_skb(unsigned int gfp_mask, void *pool_data)
+mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data)
 {
 	struct mempool_zone *zone = pool_data;