1 files changed, 4 insertions, 3 deletions

diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index 0c4132dd3507..98838a05ba6d 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -89,8 +89,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
         const struct exception_table_entry *fixup;
         int fault, si_code = SEGV_MAPERR;
         siginfo_t info;
-        unsigned int flags = (FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                              (cause > 0 ? FAULT_FLAG_WRITE : 0));
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         /* As of EV6, a load into $31/$f31 is a prefetch, and never faults
            (or is suppressed by the PALcode).  Support that for older CPUs
@@ -115,7 +114,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
         if (address >= TASK_SIZE)
                 goto vmalloc_fault;
 #endif
-
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
@@ -142,6 +142,7 @@ retry:
         } else {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         }
 
         /* If for any reason at all we couldn't handle the fault,