浏览代码

i386: add TRACE_IRQS_OFF for the nmi

At this point interrupts are off, so let's inform the tracing
code of that fact before calling into C.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Alexander van Heukelum 16 年之前
父节点
当前提交
e0c7317557
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      arch/x86/kernel/entry_32.S

+ 2 - 0
arch/x86/kernel/entry_32.S

@@ -849,6 +849,7 @@ nmi_stack_correct:
 	pushl %eax
 	pushl %eax
 	CFI_ADJUST_CFA_OFFSET 4
 	CFI_ADJUST_CFA_OFFSET 4
 	SAVE_ALL
 	SAVE_ALL
+	TRACE_IRQS_OFF
 	xorl %edx,%edx		# zero error code
 	xorl %edx,%edx		# zero error code
 	movl %esp,%eax		# pt_regs pointer
 	movl %esp,%eax		# pt_regs pointer
 	call do_nmi
 	call do_nmi
@@ -889,6 +890,7 @@ nmi_espfix_stack:
 	pushl %eax
 	pushl %eax
 	CFI_ADJUST_CFA_OFFSET 4
 	CFI_ADJUST_CFA_OFFSET 4
 	SAVE_ALL
 	SAVE_ALL
+	TRACE_IRQS_OFF
 	FIXUP_ESPFIX_STACK		# %eax == %esp
 	FIXUP_ESPFIX_STACK		# %eax == %esp
 	xorl %edx,%edx			# zero error code
 	xorl %edx,%edx			# zero error code
 	call do_nmi
 	call do_nmi