[Xen-changelog] [linux-2.6.18-xen] Imported patch rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch from xen-unstable.hg 15200:bd3d6b4c52ec

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1180947924 -3600
# Node ID f1b1f024f0ed7c4fa27a8f682498ecadf973f247
# Parent  5ce6cd5ee596d51861829eba00bd723cf15f8ef5
Imported patch rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch from 
xen-unstable.hg 15200:bd3d6b4c52ec
---
 arch/i386/kernel/entry.S |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r 5ce6cd5ee596 -r f1b1f024f0ed arch/i386/kernel/entry.S
--- a/arch/i386/kernel/entry.S  Mon Jun 04 10:05:24 2007 +0100
+++ b/arch/i386/kernel/entry.S  Mon Jun 04 10:05:24 2007 +0100
@@ -269,7 +269,7 @@ ENTRY(sysenter_entry)
        CFI_STARTPROC simple
        CFI_DEF_CFA esp, 0
        CFI_REGISTER esp, ebp
-       movl TSS_sysenter_esp0(%esp),%esp
+       movl SYSENTER_stack_esp0(%esp),%esp
 sysenter_past_esp:
        /*
         * No need to follow this irqs on/off section: the syscall
@@ -689,7 +689,7 @@ device_not_available_emulate:
  * that sets up the real kernel stack. Check here, since we can't
  * allow the wrong stack to be used.
  *
- * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have
+ * "SYSENTER_stack_esp0+12" is because the NMI/debug handler will have
  * already pushed 3 words if it hits on the sysenter instruction:
  * eflags, cs and eip.
  *
@@ -701,7 +701,7 @@ device_not_available_emulate:
        cmpw $__KERNEL_CS,4(%esp);              \
        jne ok;                                 \
 label:                                         \
-       movl TSS_sysenter_esp0+offset(%esp),%esp;       \
+       movl SYSENTER_stack_esp0+offset(%esp),%esp;     \
        pushfl;                                 \
        pushl $__KERNEL_CS;                     \
        pushl $sysenter_past_esp

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog