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/ia64 | |
| 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/ia64')
| -rw-r--r-- | arch/ia64/mm/fault.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index 6cf0341f978e..7225dad87094 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c @@ -90,8 +90,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re mask = ((((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT) | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT)); - flags |= ((mask & VM_WRITE) ? FAULT_FLAG_WRITE : 0); - /* mmap_sem is performance critical.... */ prefetchw(&mm->mmap_sem); @@ -119,6 +117,10 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re if (notify_page_fault(regs, TRAP_BRKPT)) return; + if (user_mode(regs)) + flags |= FAULT_FLAG_USER; + if (mask & VM_WRITE) + flags |= FAULT_FLAG_WRITE; retry: down_read(&mm->mmap_sem); |