diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-10 12:01:01 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-10 12:01:01 +0800 |
| commit | 106bdd9b95b3da7d762c4e0e59427444ff9f455d (patch) | |
| tree | 98faf0ff11c604f2f257186efe6b438ccfce7e65 /mm/filemap.c | |
| parent | d8715e9813acd06f36ae484d569573b1972c5ec8 (diff) | |
| parent | fd0d0fd17f47e0015e5be2a1e58434144a5f99e0 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index c588d1222b2a..c33c31d75a2b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1559,6 +1559,11 @@ static ssize_t 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, |