diff --git a/[refs] b/[refs] index bf72c0b90d87..3c852b74a790 100644 --- 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 index ac22b00d86c3..740e6b9faf7a 100644 --- 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)