diff options
Diffstat (limited to 'arch/x86/kernel/kprobes_32.c')
-rw-r--r-- | arch/x86/kernel/kprobes_32.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/kprobes_32.c b/arch/x86/kernel/kprobes_32.c index e7d0d3c2ef64..06b86e5617f6 100644 --- a/arch/x86/kernel/kprobes_32.c +++ b/arch/x86/kernel/kprobes_32.c | |||
@@ -584,7 +584,7 @@ out: | |||
584 | return 1; | 584 | return 1; |
585 | } | 585 | } |
586 | 586 | ||
587 | static int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) | 587 | int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr) |
588 | { | 588 | { |
589 | struct kprobe *cur = kprobe_running(); | 589 | struct kprobe *cur = kprobe_running(); |
590 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); | 590 | struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); |
@@ -666,7 +666,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, | |||
666 | ret = NOTIFY_STOP; | 666 | ret = NOTIFY_STOP; |
667 | break; | 667 | break; |
668 | case DIE_GPF: | 668 | case DIE_GPF: |
669 | case DIE_PAGE_FAULT: | ||
670 | /* kprobe_running() needs smp_processor_id() */ | 669 | /* kprobe_running() needs smp_processor_id() */ |
671 | preempt_disable(); | 670 | preempt_disable(); |
672 | if (kprobe_running() && | 671 | if (kprobe_running() && |