summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-13 09:03:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-13 09:03:02 -0800
commite0b325d310a6b11f1538413fd557d2eb98f2fae5 (patch)
treefcbe1573c7d69e500070447fb87f17d754c16665 /arch
parent28839855bf623f2d7eee72377d4896770a45494f (diff)
parente8cea892dff8e3ebed42954c46730309b617196f (diff)
downloadlinux-3.10-e0b325d310a6b11f1538413fd557d2eb98f2fae5.tar.gz
linux-3.10-e0b325d310a6b11f1538413fd557d2eb98f2fae5.tar.bz2
linux-3.10-e0b325d310a6b11f1538413fd557d2eb98f2fae5.zip
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"
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 d6f0490a739..46469029e9d 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