diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 6237f84841a46..5c5d80f4d53a2 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -2124,15 +2124,11 @@ static __always_inline void exc_machine_check_user(struct pt_regs *regs)
 {
 	irqentry_state_t irq_state;
 
-	irq_state = irqentry_nmi_enter(regs);
-
 	irqentry_enter_from_user_mode(regs);
-
+	irq_state = irqentry_nmi_enter(regs);
 	do_machine_check(regs);
-
-	irqentry_exit_to_user_mode(regs);
-
 	irqentry_nmi_exit(regs, irq_state);
+	irqentry_exit_to_user_mode(regs);
 }
 
 #ifdef CONFIG_X86_64