1 files changed, 6 insertions, 2 deletions

diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c
index 8ed3c4509d84..0dc922dba915 100644
--- a/arch/unicore32/mm/fault.c
+++ b/arch/unicore32/mm/fault.c
@@ -209,8 +209,7 @@ static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         struct task_struct *tsk;
         struct mm_struct *mm;
         int fault, sig, code;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                 ((!(fsr ^ 0x12)) ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         tsk = current;
         mm = tsk->mm;
@@ -222,6 +221,11 @@ static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+        if (!(fsr ^ 0x12))
+                flags |= FAULT_FLAG_WRITE;
+
         /*
          * As per x86, we may deadlock here.  However, since the kernel only
          * validly references user space from well defined areas of the code,