1 files changed, 4 insertions, 11 deletions

diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 72e593e94053..5bc46f151344 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -151,12 +151,12 @@ static uint __kprobes is_cmp_ctype_unc_inst(uint template, uint slot,
 
         cmp_inst.l = kprobe_inst;
         if ((cmp_inst.f.x2 == 0) || (cmp_inst.f.x2 == 1)) {
-                /* Integere compare - Register Register (A6 type)*/
+                /* Integer compare - Register Register (A6 type)*/
                 if ((cmp_inst.f.tb == 0) && (cmp_inst.f.ta == 0)
                                 &&(cmp_inst.f.c == 1))
                         ctype_unc = 1;
         } else if ((cmp_inst.f.x2 == 2)||(cmp_inst.f.x2 == 3)) {
-                /* Integere compare - Immediate Register (A8 type)*/
+                /* Integer compare - Immediate Register (A8 type)*/
                 if ((cmp_inst.f.ta == 0) &&(cmp_inst.f.c == 1))
                         ctype_unc = 1;
         }
@@ -820,7 +820,7 @@ out:
         return 1;
 }
 
-static int __kprobes kprobes_fault_handler(struct pt_regs *regs, int trapnr)
+int __kprobes kprobes_fault_handler(struct pt_regs *regs, int trapnr)
 {
         struct kprobe *cur = kprobe_running();
         struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
@@ -904,13 +904,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
                         if (post_kprobes_handler(args->regs))
                                 ret = NOTIFY_STOP;
                 break;
-        case DIE_PAGE_FAULT:
-                /* kprobe_running() needs smp_processor_id() */
-                preempt_disable();
-                if (kprobe_running() &&
-                        kprobes_fault_handler(args->regs, args->trapnr))
-                        ret = NOTIFY_STOP;
-                preempt_enable();
         default:
                 break;
         }
@@ -954,7 +947,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         /*
          * Callee owns the argument space and could overwrite it, eg
          * tail call optimization. So to be absolutely safe
-         * we save the argument space before transfering the control
+         * we save the argument space before transferring the control
          * to instrumented jprobe function which runs in
          * the process context
          */