diff --git a/[refs] b/[refs] index 7db50073f59e..c359353afd44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9597362d354f8655ece324b01d0c640a0e99c077 +refs/heads/master: 4cd13504652d28e16bf186c6bb2bbb3725369383 diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index 0670c915cd35..a861bb318ac8 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -320,7 +320,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos, break; error = add_to_page_cache_lru(page, mapping, index, - GFP_KERNEL); + mapping_gfp_mask(mapping)); if (unlikely(error)) { page_cache_release(page); if (error == -EEXIST)