diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 12:03:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 12:03:02 -0500 |
| commit | e0b325d310a6b11f1538413fd557d2eb98f2fae5 (patch) | |
| tree | fcbe1573c7d69e500070447fb87f17d754c16665 | |
| parent | 28839855bf623f2d7eee72377d4896770a45494f (diff) | |
| parent | e8cea892dff8e3ebed42954c46730309b617196f (diff) | |
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"
| -rw-r--r-- | arch/x86/kernel/entry_32.S | 2 |
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: | |||
| 1203 | pushl %eax | 1203 | pushl %eax |
| 1204 | CFI_ADJUST_CFA_OFFSET 4 | 1204 | CFI_ADJUST_CFA_OFFSET 4 |
| 1205 | SAVE_ALL | 1205 | SAVE_ALL |
| 1206 | TRACE_IRQS_OFF | ||
| 1207 | xorl %edx,%edx # zero error code | 1206 | xorl %edx,%edx # zero error code |
| 1208 | movl %esp,%eax # pt_regs pointer | 1207 | movl %esp,%eax # pt_regs pointer |
| 1209 | call do_nmi | 1208 | call do_nmi |
| @@ -1244,7 +1243,6 @@ nmi_espfix_stack: | |||
| 1244 | pushl %eax | 1243 | pushl %eax |
| 1245 | CFI_ADJUST_CFA_OFFSET 4 | 1244 | CFI_ADJUST_CFA_OFFSET 4 |
| 1246 | SAVE_ALL | 1245 | SAVE_ALL |
| 1247 | TRACE_IRQS_OFF | ||
| 1248 | FIXUP_ESPFIX_STACK # %eax == %esp | 1246 | FIXUP_ESPFIX_STACK # %eax == %esp |
| 1249 | xorl %edx,%edx # zero error code | 1247 | xorl %edx,%edx # zero error code |
| 1250 | call do_nmi | 1248 | call do_nmi |