ia64/linux-2.6.18-xen.hg

changeset 13:f1b1f024f0ed

Imported patch rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch from xen-unstable.hg 15200:bd3d6b4c52ec
author Ian Campbell <ian.campbell@xensource.com>
date Mon Jun 04 10:05:24 2007 +0100 (2007-06-04)
parents 5ce6cd5ee596
children f58a34be59d6
files arch/i386/kernel/entry.S
line diff
     1.1 --- a/arch/i386/kernel/entry.S	Mon Jun 04 10:05:24 2007 +0100
     1.2 +++ b/arch/i386/kernel/entry.S	Mon Jun 04 10:05:24 2007 +0100
     1.3 @@ -269,7 +269,7 @@ ENTRY(sysenter_entry)
     1.4  	CFI_STARTPROC simple
     1.5  	CFI_DEF_CFA esp, 0
     1.6  	CFI_REGISTER esp, ebp
     1.7 -	movl TSS_sysenter_esp0(%esp),%esp
     1.8 +	movl SYSENTER_stack_esp0(%esp),%esp
     1.9  sysenter_past_esp:
    1.10  	/*
    1.11  	 * No need to follow this irqs on/off section: the syscall
    1.12 @@ -689,7 +689,7 @@ device_not_available_emulate:
    1.13   * that sets up the real kernel stack. Check here, since we can't
    1.14   * allow the wrong stack to be used.
    1.15   *
    1.16 - * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have
    1.17 + * "SYSENTER_stack_esp0+12" is because the NMI/debug handler will have
    1.18   * already pushed 3 words if it hits on the sysenter instruction:
    1.19   * eflags, cs and eip.
    1.20   *
    1.21 @@ -701,7 +701,7 @@ device_not_available_emulate:
    1.22  	cmpw $__KERNEL_CS,4(%esp);		\
    1.23  	jne ok;					\
    1.24  label:						\
    1.25 -	movl TSS_sysenter_esp0+offset(%esp),%esp;	\
    1.26 +	movl SYSENTER_stack_esp0+offset(%esp),%esp;	\
    1.27  	pushfl;					\
    1.28  	pushl $__KERNEL_CS;			\
    1.29  	pushl $sysenter_past_esp