aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/head_32.S4
-rw-r--r--arch/x86/kernel/head_64.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index d031bad9e07e..02d257256200 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -547,7 +547,7 @@ ENTRY(early_idt_handler)
547 cld 547 cld
548 548
549 cmpl $2,(%esp) # X86_TRAP_NMI 549 cmpl $2,(%esp) # X86_TRAP_NMI
550 je is_nmi # Ignore NMI 550 je .Lis_nmi # Ignore NMI
551 551
552 cmpl $2,%ss:early_recursion_flag 552 cmpl $2,%ss:early_recursion_flag
553 je hlt_loop 553 je hlt_loop
@@ -600,7 +600,7 @@ ex_entry:
600 pop %ecx 600 pop %ecx
601 pop %eax 601 pop %eax
602 decl %ss:early_recursion_flag 602 decl %ss:early_recursion_flag
603is_nmi: 603.Lis_nmi:
604 addl $8,%esp /* drop vector number and error code */ 604 addl $8,%esp /* drop vector number and error code */
605 iret 605 iret
606ENDPROC(early_idt_handler) 606ENDPROC(early_idt_handler)
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index ae6588b301c2..43eafc8afb69 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -344,7 +344,7 @@ ENTRY(early_idt_handler)
344 cld 344 cld
345 345
346 cmpl $2,(%rsp) # X86_TRAP_NMI 346 cmpl $2,(%rsp) # X86_TRAP_NMI
347 je is_nmi # Ignore NMI 347 je .Lis_nmi # Ignore NMI
348 348
349 cmpl $2,early_recursion_flag(%rip) 349 cmpl $2,early_recursion_flag(%rip)
350 jz 1f 350 jz 1f
@@ -409,7 +409,7 @@ ENTRY(early_idt_handler)
409 popq %rcx 409 popq %rcx
410 popq %rax 410 popq %rax
411 decl early_recursion_flag(%rip) 411 decl early_recursion_flag(%rip)
412is_nmi: 412.Lis_nmi:
413 addq $16,%rsp # drop vector number and error code 413 addq $16,%rsp # drop vector number and error code
414 INTERRUPT_RETURN 414 INTERRUPT_RETURN
415ENDPROC(early_idt_handler) 415ENDPROC(early_idt_handler)