Commit e8cea892 authored by Ingo Molnar's avatar Ingo Molnar

Revert "i386: add TRACE_IRQS_OFF for the nmi"

This reverts commit e0c73175.

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: default avatarIngo Molnar <mingo@elte.hu>
parent 50c668d6
...@@ -1203,7 +1203,6 @@ nmi_stack_correct: ...@@ -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: ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment