[patch 0/1] Fix default_do_nmi on x86_64 in 2.6.21-mm2

[patch 0/1] Fix default_do_nmi on x86_64 in 2.6.21-mm2

[Mathieu Desnoyers]

Hi Andrew,

I guess it's the expected behavior for default_do_nmi on x86_64 : there is a new
case tested in the -mm tree but it lacks the appropriate return.

It applies at the end of the 2.6.21-mm2 patch series.

Mathieu

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68

[patch 1/1] x86_64 : fix default_do_nmi() missing return after a if ()

[Mathieu Desnoyers]

[-- Attachment #1: x86_64-fix-default-do-nmi.patch --]
[-- Type: text/plain, Size: 727 bytes --]

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
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