diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:45:01 -0700 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-09-24 22:45:01 -0700 |
| commit | 1cfb9d628fa24c0a8b24cd604ae62dfa10a0d716 (patch) | |
| tree | 4e57e7465ce5fbc2a6cc838fd78e5e8a2b9799ff /arch/arm/mm/fault.c | |
| parent | d595150285cf886cf2399fd74b0eeb43b444c706 (diff) | |
| parent | 7ecc9777c5c76d7b31c376ffd4f59c4a85472a1b (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into v4.9/topic/ionv4.9/topic/ion
Diffstat (limited to 'arch/arm/mm/fault.c')
| -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 0122ad1a6027..f7861dc83182 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 |