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);