---

yaml --- r: 199894 b: refs/heads/master c: 0ae0b5d h: refs/heads/master v: v3
git-mirror · May 25, 2010 · e64c1e6 · e64c1e6
1 parent b86fe97
commit e64c1e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d02a2c077fb81f3224c770be62a318165b23b486
+refs/heads/master: 0ae0b5d0557264bad65e22f1e2da4b83a02c4535
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
@@ -354,7 +354,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
 				break;
 
 			error = add_to_page_cache_lru(page, mapping, index,
-						mapping_gfp_mask(mapping));
+						GFP_KERNEL);
 			if (unlikely(error)) {
 				page_cache_release(page);
 				if (error == -EEXIST)