diff options
Diffstat (limited to 'arch/i386/kernel/traps.c')
-rw-r--r-- | arch/i386/kernel/traps.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index d70819481f6e..00c63419c06f 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -643,16 +643,15 @@ void unset_nmi_callback(void) | |||
643 | } | 643 | } |
644 | 644 | ||
645 | #ifdef CONFIG_KPROBES | 645 | #ifdef CONFIG_KPROBES |
646 | fastcall int do_int3(struct pt_regs *regs, long error_code) | 646 | fastcall void do_int3(struct pt_regs *regs, long error_code) |
647 | { | 647 | { |
648 | if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) | 648 | if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) |
649 | == NOTIFY_STOP) | 649 | == NOTIFY_STOP) |
650 | return 1; | 650 | return; |
651 | /* This is an interrupt gate, because kprobes wants interrupts | 651 | /* This is an interrupt gate, because kprobes wants interrupts |
652 | disabled. Normal trap handlers don't. */ | 652 | disabled. Normal trap handlers don't. */ |
653 | restore_interrupts(regs); | 653 | restore_interrupts(regs); |
654 | do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL); | 654 | do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL); |
655 | return 0; | ||
656 | } | 655 | } |
657 | #endif | 656 | #endif |
658 | 657 | ||