Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: export length of os_hpmc vector
  parisc: fix kernel crash (protection id trap) when compiling ruby1.9
  parisc: Use DEFINE_SPINLOCK
  parisc: add uevent helper for parisc bus
  parisc: fix ipv6 checksum
  parisc: quiet palo not-found message from "which"
  parisc: Replace NR_CPUS in parisc code
  parisc: trivial fixes
  parisc: fix braino in commit adding __space_to_prot
  parisc: factor out sid to protid conversion
  parisc: use leX_to_cpu in place of __fswabX
  parisc: fix GFP_KERNEL use while atomic in unwinder
  parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
  parisc: set_time() catch errors
  parisc: use the new byteorder headers
  parisc: drivers/parisc/: make code static
  parisc: lib/: make code static

1 files changed, 31 insertions, 27 deletions

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