瀏覽代碼

Revert "i386: add TRACE_IRQS_OFF for the nmi"

This reverts commit e0c7317557c8fc8eacf611e30c2a80f4e24e47a3.

This patch was wrong, as lockdep (and thus the irq state tracer)
aren't nmi safe. People are already seeing lockdep warnings due
to this.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar 16 年之前
父節點
當前提交
e8cea892df
共有 1 個文件被更改,包括 0 次插入2 次删除
  1. 0 2
      arch/x86/kernel/entry_32.S

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

@@ -1203,7 +1203,6 @@ 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
@@ -1244,7 +1243,6 @@ 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