---

yaml --- r: 319996 b: refs/heads/master c: e04f228 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · d1b3db6 · d1b3db6
1 parent 87de42c
commit d1b3db6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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);