Merge branch 'x86-fixes-for-linus' of...

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Revert "i386: add TRACE_IRQS_OFF for the nmi"

parents 28839855 e8cea892

arch/x86/kernel/entry_32.S

+0 −2

Original line number	Diff line number	Diff line
		@@ -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