diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-03 12:01:45 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-03 12:01:45 +0800 |
| commit | fb99e783cf80d346ba059e0cde152c3ee1658aa9 (patch) | |
| tree | 472f0cbbc5ab5caeac92464f3433634ee44cc0cb /arch/arm64/mm | |
| parent | 330dcbb078611d82bb4875cb84727c8d8434aa8f (diff) | |
| parent | fdc606b05cf777ef1f703d4ef1eabc2069a7b374 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
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 c7809f41d9d1..0de0910e1d5d 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -366,8 +366,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 |