3 files changed, 37 insertions, 27 deletions

diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index 4878b9501f24..1c6dbb6f6e56 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -241,4 +241,6 @@ unsigned long copy_in_user(void __user *dst, const void __user *src, unsigned lo
 #define __copy_to_user_inatomic __copy_to_user
 #define __copy_from_user_inatomic __copy_from_user
 
+int fixup_exception(struct pt_regs *regs);
+
 #endif /* __PARISC_UACCESS_H */
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 4c771cd580ec..548ba0c654d2 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -745,6 +745,10 @@ void handle_interruption(int code, struct pt_regs *regs)
                 /* Fall Through */
         case 27: 
                 /* Data memory protection ID trap */
+                if (code == 27 && !user_mode(regs) &&
+                        fixup_exception(regs))
+                        return;
+
                 die_if_kernel("Protection id trap", regs, code);
                 si.si_code = SEGV_MAPERR;
                 si.si_signo = SIGSEGV;
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index b2e3e9a8cece..92c7fa4ecc3f 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -139,13 +139,41 @@ parisc_acctyp(unsigned long code, unsigned int inst)
                         }
 #endif
 
+int fixup_exception(struct pt_regs *regs)
+{
+        const struct exception_table_entry *fix;
+
+        fix = search_exception_tables(regs->iaoq[0]);
+        if (fix) {
+                struct exception_data *d;
+                d = &__get_cpu_var(exception_data);
+                d->fault_ip = regs->iaoq[0];
+                d->fault_space = regs->isr;
+                d->fault_addr = regs->ior;
+
+                regs->iaoq[0] = ((fix->fixup) & ~3);
+                /*
+                 * NOTE: In some cases the faulting instruction
+                 * may be in the delay slot of a branch. We
+                 * don't want to take the branch, so we don't
+                 * increment iaoq[1], instead we set it to be
+                 * iaoq[0]+4, and clear the B bit in the PSW
+                 */
+                regs->iaoq[1] = regs->iaoq[0] + 4;
+                regs->gr[0] &= ~PSW_B; /* IPSW in gr[0] */
+
+                return 1;
+        }
+
+        return 0;
+}
+
 void do_page_fault(struct pt_regs *regs, unsigned long code,
                               unsigned long address)
 {
         struct vm_area_struct *vma, *prev_vma;
         struct task_struct *tsk = current;
         struct mm_struct *mm = tsk->mm;
-        const struct exception_table_entry *fix;
         unsigned long acc_type;
         int fault;
 
@@ -229,32 +257,8 @@ bad_area:
 
 no_context:
 
-        if (!user_mode(regs)) {
-                fix = search_exception_tables(regs->iaoq[0]);
-
-                if (fix) {
-                        struct exception_data *d;
-
-                        d = &__get_cpu_var(exception_data);
-                        d->fault_ip = regs->iaoq[0];
-                        d->fault_space = regs->isr;
-                        d->fault_addr = regs->ior;
-
-                        regs->iaoq[0] = ((fix->fixup) & ~3);
-
-                        /*
-                         * NOTE: In some cases the faulting instruction
-                         * may be in the delay slot of a branch. We
-                         * don't want to take the branch, so we don't
-                         * increment iaoq[1], instead we set it to be
-                         * iaoq[0]+4, and clear the B bit in the PSW
-                         */
-
-                        regs->iaoq[1] = regs->iaoq[0] + 4;
-                        regs->gr[0] &= ~PSW_B; /* IPSW in gr[0] */
-
-                        return;
-                }
+        if (!user_mode(regs) && fixup_exception(regs)) {
+                return;
         }
 
         parisc_terminate("Bad Address (null pointer deref?)", regs, code, address);