Skip to contentSkip to conversation

Fix default_do_nmi on x86_64 in 2.6.21-mm2

PATCH New Mathieu Desnoyers 1 participant 2 messages May 10, 2007

lore
Share & tools
lore

Mathieu Desnoyers

author
#0 lore raw

cover Fix default_do_nmi on x86_64 in 2.6.21-mm2

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

Signature · 3 lines
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
author
#1 lore raw

PATCH 1/1 x86_64 : fix default_do_nmi() missing return after a if ()

Signed-off-by Mathieu Desnoyers <[email protected]>
arch/x86_64/kernel/traps.c +1 -0
Index: linux-2.6-lttng/arch/x86_64/kernel/traps.c
===================================================================
@@ -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);
Signature · 3 lines
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68