Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 9d9b705ac0e7ea5d8d3f186e4e01b07f5d88502a..036046223c4f4b8b952012ad68df9a8f3fcc0d8b 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1123,6 +1123,11 @@ static void do_generic_file_read(struct file *filp, loff_t *ppos,
 
                cond_resched();
 find_page:
+               if (fatal_signal_pending(current)) {
+                       error = -EINTR;
+                       goto out;
+               }
+
                page = find_get_page(mapping, index);
                if (!page) {
                        page_cache_sync_readahead(mapping,