Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d0251f authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

i386: really stop MCEs during code patching 



It's CONFIG_X86_MCE, not CONFIG_MCE.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 08da5a2c

arch/i386/kernel/alternative.c

+2 −2
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ void __init alternative_instructions(void) 
	   that might execute the to be patched code.

	   Other CPUs are not running. */

	stop_nmi();

#ifdef CONFIG_MCE

#ifdef CONFIG_X86_MCE

	stop_mce();

#endif
@@ -426,7 +426,7 @@ void __init alternative_instructions(void) 
	local_irq_restore(flags);



	restart_nmi();

#ifdef CONFIG_MCE

#ifdef CONFIG_X86_MCE

	restart_mce();

#endif

}