diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
| commit | 09cc926e9a6002790e69ed213217ef9874888624 (patch) | |
| tree | d97960db291ce620a9ee216b4d3cafd6f38ee2d3 /arch/s390 | |
| parent | d18b9ba808322f843375c262a7df889ff406a71c (diff) | |
| parent | 252f23ea5987a4730e3399ef1ad5d78efcc786c9 (diff) | |
Merge tag 'v3.10.61' into linux-linaro-lsk
This is the 3.10.61 stable release
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 047c3e4c59a2..416facec4a33 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -302,6 +302,8 @@ static inline int do_exception(struct pt_regs *regs, int access) address = trans_exc_code & __FAIL_ADDR_MASK; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE; + if (user_mode(regs)) + flags |= FAULT_FLAG_USER; if (access == VM_WRITE || (trans_exc_code & store_indication) == 0x400) flags |= FAULT_FLAG_WRITE; down_read(&mm->mmap_sem); |