diff options
author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-09-09 15:56:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 04:20:49 -0400 |
commit | e0c7317557c8fc8eacf611e30c2a80f4e24e47a3 (patch) | |
tree | de9152bc2af266bf64f79f938a61ba51894aaed6 /arch/x86 | |
parent | 43024a8a5d4c63952687286f3083f7f34d4da2cc (diff) |
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>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/entry_32.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index a278505baa11..2abdc9a9f7bc 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -849,6 +849,7 @@ nmi_stack_correct: | |||
849 | pushl %eax | 849 | pushl %eax |
850 | CFI_ADJUST_CFA_OFFSET 4 | 850 | CFI_ADJUST_CFA_OFFSET 4 |
851 | SAVE_ALL | 851 | SAVE_ALL |
852 | TRACE_IRQS_OFF | ||
852 | xorl %edx,%edx # zero error code | 853 | xorl %edx,%edx # zero error code |
853 | movl %esp,%eax # pt_regs pointer | 854 | movl %esp,%eax # pt_regs pointer |
854 | call do_nmi | 855 | call do_nmi |
@@ -889,6 +890,7 @@ nmi_espfix_stack: | |||
889 | pushl %eax | 890 | pushl %eax |
890 | CFI_ADJUST_CFA_OFFSET 4 | 891 | CFI_ADJUST_CFA_OFFSET 4 |
891 | SAVE_ALL | 892 | SAVE_ALL |
893 | TRACE_IRQS_OFF | ||
892 | FIXUP_ESPFIX_STACK # %eax == %esp | 894 | FIXUP_ESPFIX_STACK # %eax == %esp |
893 | xorl %edx,%edx # zero error code | 895 | xorl %edx,%edx # zero error code |
894 | call do_nmi | 896 | call do_nmi |