Signed-off-by: Mathieu Desnoyers Index: linux-2.6-lttng/arch/x86_64/kernel/traps.c =================================================================== --- linux-2.6-lttng.orig/arch/x86_64/kernel/traps.c 2007-05-09 17:29:51.000000000 -0400 +++ linux-2.6-lttng/arch/x86_64/kernel/traps.c 2007-05-09 17:30:07.000000000 -0400 @@ -779,6 +779,7 @@ return; if (notify_die(DIE_NMI_POST, "nmi_post", regs, reason, 2, 0) == NOTIFY_STOP) + return; if (!do_nmi_callback(regs,cpu)) unknown_nmi_error(reason, regs); -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/