1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c
index 689ffd86d5e9..318164cabdfc 100644
--- a/arch/arc/mm/fault.c
+++ b/arch/arc/mm/fault.c
@@ -15,6 +15,7 @@
 #include <linux/uaccess.h>
 #include <linux/kdebug.h>
 #include <asm/pgalloc.h>
+#include <asm/mmu.h>
 
 static int handle_vmalloc_fault(struct mm_struct *mm, unsigned long address)
 {
@@ -51,14 +52,14 @@ bad_area:
         return 1;
 }
 
-void do_page_fault(struct pt_regs *regs, int write, unsigned long address,
-                   unsigned long cause_code)
+void do_page_fault(struct pt_regs *regs, unsigned long address)
 {
         struct vm_area_struct *vma = NULL;
         struct task_struct *tsk = current;
         struct mm_struct *mm = tsk->mm;
         siginfo_t info;
         int fault, ret;
+        int write = regs->ecr_cause & ECR_C_PROTV_STORE;  /* ST/EX */
         unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
                                 (write ? FAULT_FLAG_WRITE : 0);
 
@@ -109,7 +110,8 @@ good_area:
 
         /* Handle protection violation, execute on heap or stack */
 
-        if (cause_code == ((ECR_V_PROTV << 16) | ECR_C_PROTV_INST_FETCH))
+        if ((regs->ecr_vec == ECR_V_PROTV) &&
+            (regs->ecr_cause == ECR_C_PROTV_INST_FETCH))
                 goto bad_area;
 
         if (write) {
@@ -176,7 +178,6 @@ bad_area_nosemaphore:
         /* User mode accesses just cause a SIGSEGV */
         if (user_mode(regs)) {
                 tsk->thread.fault_address = address;
-                tsk->thread.cause_code = cause_code;
                 info.si_signo = SIGSEGV;
                 info.si_errno = 0;
                 /* info.si_code has been set above */
@@ -197,7 +198,7 @@ no_context:
         if (fixup_exception(regs))
                 return;
 
-        die("Oops", regs, address, cause_code);
+        die("Oops", regs, address);
 
 out_of_memory:
         if (is_global_init(tsk)) {
@@ -218,7 +219,6 @@ do_sigbus:
                 goto no_context;
 
         tsk->thread.fault_address = address;
-        tsk->thread.cause_code = cause_code;
         info.si_signo = SIGBUS;
         info.si_errno = 0;
         info.si_code = BUS_ADRERR;