diff options
Diffstat (limited to 'arch/powerpc/kernel/kprobes.c')
-rw-r--r-- | arch/powerpc/kernel/kprobes.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index 088b8c6defa0..0c96611f02f4 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c | |||
@@ -401,7 +401,7 @@ out: | |||
401 | return 1; | 401 | return 1; |
402 | } | 402 | } |
403 | 403 | ||
404 | static int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) | 404 | int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) |
405 | { | 405 | { |
406 | struct kprobe *cur = kprobe_running(); | 406 | struct kprobe *cur = kprobe_running(); |
407 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); | 407 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); |
@@ -486,14 +486,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, | |||
486 | if (post_kprobe_handler(args->regs)) | 486 | if (post_kprobe_handler(args->regs)) |
487 | ret = NOTIFY_STOP; | 487 | ret = NOTIFY_STOP; |
488 | break; | 488 | break; |
489 | case DIE_PAGE_FAULT: | ||
490 | /* kprobe_running() needs smp_processor_id() */ | ||
491 | preempt_disable(); | ||
492 | if (kprobe_running() && | ||
493 | kprobe_fault_handler(args->regs, args->trapnr)) | ||
494 | ret = NOTIFY_STOP; | ||
495 | preempt_enable(); | ||
496 | break; | ||
497 | default: | 489 | default: |
498 | break; | 490 | break; |
499 | } | 491 | } |