From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Tue, 9 Sep 2008 19:56:16 +0000 (+0200)
Subject: i386: add TRACE_IRQS_OFF for the nmi
X-Git-Tag: v2.6.28-rc1~611^2~73
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e0c7317557c8fc8eacf611e30c2a80f4e24e47a3;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index a278505baa1..2abdc9a9f7b 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -849,6 +849,7 @@ 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
@@ -889,6 +890,7 @@ 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