diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-14 04:01:31 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-14 04:01:31 (GMT) |
| commit | a2c2b91df6f826596e697da3037e955b7d48b1ce (patch) | |
| tree | 264d280710918871707eadd5d3add090949112e2 /arch/arm | |
| parent | a27e72a62c09eebc54bbd8db5afc338d2e956c37 (diff) | |
| parent | 4ad5dcaca7428dd2bc1a6a40c948e3799c1e27ae (diff) | |
| download | linux-a2c2b91df6f826596e697da3037e955b7d48b1ce.tar.xz | |
Merge tag 'v4.9.50' into linux-linaro-lsk-v4.9
This is the 4.9.50 stable release
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/fault.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 0122ad1..f7861dc 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -314,8 +314,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 |