diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:02:26 +0800 |
| commit | d97f745e1d2fea4d2f308e5e06eee81a9a84f3f5 (patch) | |
| tree | 1a24a0ad0c33e1d6344d2454b61748afb74a6693 /mm/filemap.c | |
| parent | cb370744bc101be91a0bc3e9fbdb670ab44df97d (diff) | |
| parent | d9e0350d2575a20ee7783427da9bd6b6107eb983 (diff) | |
Merge tag 'v4.1.39' into linux-linaro-lsk-v4.1lsk-v4.1-17.03
This is the 4.1.39 stable release
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 803f46761fe8..731d0876ccaf 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1501,6 +1501,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, |