Skip to content

Commit 7374953

Browse files
Peter ZijlstraKAGA-KOKO
authored andcommitted
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: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 77ca93a commit 7374953

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,10 +1992,9 @@ static __always_inline void exc_machine_check_kernel(struct pt_regs *regs)
19921992
* that out because it's an indirect call. Annotate it.
19931993
*/
19941994
instrumentation_begin();
1995-
trace_hardirqs_off_finish();
1995+
19961996
machine_check_vector(regs);
1997-
if (regs->flags & X86_EFLAGS_IF)
1998-
trace_hardirqs_on_prepare();
1997+
19991998
instrumentation_end();
20001999
irqentry_nmi_exit(regs, irq_state);
20012000
}
@@ -2004,7 +2003,9 @@ static __always_inline void exc_machine_check_user(struct pt_regs *regs)
20042003
{
20052004
irqentry_enter_from_user_mode(regs);
20062005
instrumentation_begin();
2006+
20072007
machine_check_vector(regs);
2008+
20082009
instrumentation_end();
20092010
irqentry_exit_to_user_mode(regs);
20102011
}

0 commit comments

Comments
 (0)