X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Fi386%2Fkernel%2Ftraps.c;h=00c63419c06f80f0af9ce17f4b7f78e18dd25df2;hb=0b9e2cac8a56e197d0a9e06268db4c8652d23dd5;hp=d70819481f6eb1af7de9b4bc5c05e7d78b0a43af;hpb=dd96a8e056e7b3e480197ff2cdf106b46455d779;p=~andy%2Flinux

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index d70819481f6..00c63419c06 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -643,16 +643,15 @@ void unset_nmi_callback(void)
 }
 
 #ifdef CONFIG_KPROBES
-fastcall int do_int3(struct pt_regs *regs, long error_code)
+fastcall void do_int3(struct pt_regs *regs, long error_code)
 {
 	if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
 			== NOTIFY_STOP)
-		return 1;
+		return;
 	/* This is an interrupt gate, because kprobes wants interrupts
 	disabled.  Normal trap handlers don't. */
 	restore_interrupts(regs);
 	do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
-	return 0;
 }
 #endif