Commit 73749536 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

x86/mce: Remove explicit/superfluous tracing 



There's some explicit tracing left in exc_machine_check_kernel(),
remove it, as it's already implied by irqentry_nmi_enter().

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210106144017.719310466@infradead.org
parent 77ca93a6

arch/x86/kernel/cpu/mce/core.c

+4 −3
Original line number Diff line number Diff line
@@ -1992,10 +1992,9 @@ static __always_inline void exc_machine_check_kernel(struct pt_regs *regs) 
	 * that out because it's an indirect call. Annotate it.

	 */

	instrumentation_begin();

	trace_hardirqs_off_finish();



	machine_check_vector(regs);

	if (regs->flags & X86_EFLAGS_IF)

		trace_hardirqs_on_prepare();



	instrumentation_end();

	irqentry_nmi_exit(regs, irq_state);

}
@@ -2004,7 +2003,9 @@ static __always_inline void exc_machine_check_user(struct pt_regs *regs) 
{

	irqentry_enter_from_user_mode(regs);

	instrumentation_begin();



	machine_check_vector(regs);



	instrumentation_end();

	irqentry_exit_to_user_mode(regs);

}