Merge /spare/repo/linux-2.6/

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index ff62551eb3a1..3c32af910d60 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/interrupt.h>
+#include <linux/kprobes.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -76,7 +77,7 @@ mapped_kernel_page_is_present (unsigned long address)
         return pte_present(pte);
 }
 
-void
+void __kprobes
 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
 {
         int signal = SIGSEGV, code = SEGV_MAPERR;
@@ -229,9 +230,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
                 return;
         }
 
-        if (ia64_done_with_exception(regs))
-                return;
-
         /*
          * Since we have no vma's for region 5, we might get here even if the address is
          * valid, due to the VHPT walker inserting a non present translation that becomes
@@ -242,6 +240,9 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         if (REGION_NUMBER(address) == 5 && mapped_kernel_page_is_present(address))
                 return;
 
+        if (ia64_done_with_exception(regs))
+                return;
+
         /*
          * Oops. The kernel tried to access some bad page. We'll have to terminate things
          * with extreme prejudice.