From d1b3db66492b6e8ca1b4b7fc6377699e7af7c1cf Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <msb@chromium.org>
Date: Mon, 30 Jul 2012 14:43:22 -0700
Subject: [PATCH] --- yaml --- r: 319996 b: refs/heads/master c:
 e04f228335bde305d2833e40382ed37fc36f9efe h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/lib/scatterlist.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 218e4fd961e2..4ad0504487a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c24aa64d169b7224f1a5bc6a4b1365da37ce861b
+refs/heads/master: e04f228335bde305d2833e40382ed37fc36f9efe
diff --git a/trunk/lib/scatterlist.c b/trunk/lib/scatterlist.c
index 6096e89bee55..d09bdd8b40ce 100644
--- a/trunk/lib/scatterlist.c
+++ b/trunk/lib/scatterlist.c
@@ -279,14 +279,6 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
 		if (!left)
 			sg_mark_end(&sg[sg_size - 1]);
 
-		/*
-		 * only really needed for mempool backed sg allocations (like
-		 * SCSI), a possible improvement here would be to pass the
-		 * table pointer into the allocator and let that clear these
-		 * flags
-		 */
-		gfp_mask &= ~__GFP_WAIT;
-		gfp_mask |= __GFP_HIGH;
 		prv = sg;
 	} while (left);