From e5468fbcb99d42cf44943f5d4807146a3a3badd6 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 1 Feb 2006 06:31:40 -0500 Subject: [PATCH] --- yaml --- r: 20047 b: refs/heads/master c: 2d20eaf9426598ef156b941bcfa44e867452b770 h: refs/heads/master i: 20045: 4fc34133a1219473d9afd002362de10180104135 20043: 474b797c0a3bb96df26ccfc6027b8598d038ff6c 20039: 9e994da55412f4ca91e74b0aab97183a9cf1dfaf 20031: d3caf043652d34719e42bbfea9ba4011548a2ecf v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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