diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-03 04:02:06 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-03 04:02:06 (GMT) |
| commit | bb8d2545b39716a327b87954f3242c856816256a (patch) | |
| tree | f25192c8aec6a4049f7bf6f5ac356324c18dd852 /arch/arm64/mm | |
| parent | 99a15512fa583684b8cc4ad4805e1e690609cdc7 (diff) | |
| parent | 458ca52f1564938c158d271f45bce0bc6ede2b3f (diff) | |
| download | linux-bb8d2545b39716a327b87954f3242c856816256a.tar.xz | |
Merge tag 'v4.9.47' into linux-linaro-lsk-v4.9
This is the 4.9.47 stable release
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/fault.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index ed0f50b..523b9d3 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -379,8 +379,11 @@ retry: * signal first. We do not need to release the mmap_sem because it * would already be released in __lock_page_or_retry in mm/filemap.c. */ - if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) + if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) { + if (!user_mode(regs)) + goto no_context; return 0; + } /* * Major/minor page fault accounting is only done on the initial |