summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-12 19:36:59 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-12 19:36:59 +0100
commite8cea892dff8e3ebed42954c46730309b617196f (patch)
treec370d5056ecc8d658cbe8aec0b139a90e186ce65 /arch
parent50c668d678fd01284799a6e4f1b91829d83cb9ed (diff)
downloadlinux-e8cea892dff8e3ebed42954c46730309b617196f.tar.gz
linux-e8cea892dff8e3ebed42954c46730309b617196f.tar.bz2
linux-e8cea892dff8e3ebed42954c46730309b617196f.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/entry_32.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index d6f0490a7391..46469029e9d3 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1203,7 +1203,6 @@ nmi_stack_correct:
pushl %eax
CFI_ADJUST_CFA_OFFSET 4
SAVE_ALL
- TRACE_IRQS_OFF
xorl %edx,%edx # zero error code
movl %esp,%eax # pt_regs pointer
call do_nmi
@@ -1244,7 +1243,6 @@ nmi_espfix_stack:
pushl %eax
CFI_ADJUST_CFA_OFFSET 4
SAVE_ALL
- TRACE_IRQS_OFF
FIXUP_ESPFIX_STACK # %eax == %esp
xorl %edx,%edx # zero error code
call do_nmi