diff --git a/[refs] b/[refs]
index 9cbded400704..b64bd11e9178 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5fb81bd895041230dfaeb8f8f498b85b4705988
+refs/heads/master: 2d20eaf9426598ef156b941bcfa44e867452b770
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
index 7d0700091f3d..2a547538d444 100644
--- a/trunk/drivers/scsi/sg.c
+++ b/trunk/drivers/scsi/sg.c
@@ -1679,7 +1679,7 @@ static int
 sg_build_sgat(Sg_scatter_hold * schp, const Sg_fd * sfp, int tablesize)
 {
 	int sg_bufflen = tablesize * sizeof(struct scatterlist);
-	unsigned int gfp_flags = GFP_ATOMIC | __GFP_NOWARN;
+	gfp_t gfp_flags = GFP_ATOMIC | __GFP_NOWARN;
 
 	/*
 	 * TODO: test without low_dma, we should not need it since