ia64/xen-unstable

changeset 9819:b15b33817f7b

Rename TSS_sysenter_esp0 to SYSENTER_stack_esp0 to reflect the actual
usage since the TSS is not used under Xen.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian.Campbell@xensource.com
date Fri Apr 21 17:49:10 2006 +0100 (2006-04-21)
parents 9b1c9d4133f8
children 5159bd543353
files linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S patches/linux-2.6.16/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c	Fri Apr 21 17:35:15 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c	Fri Apr 21 17:49:10 2006 +0100
     1.3 @@ -66,11 +66,11 @@ void foo(void)
     1.4  
     1.5  #ifndef CONFIG_X86_NO_TSS
     1.6  	/* Offset from the sysenter stack to tss.esp0 */
     1.7 -	DEFINE(TSS_sysenter_esp0, offsetof(struct tss_struct, esp0) -
     1.8 +	DEFINE(SYSENTER_stack_esp0, offsetof(struct tss_struct, esp0) -
     1.9  		 sizeof(struct tss_struct));
    1.10  #else
    1.11  	/* sysenter stack points directly to esp0 */
    1.12 -	DEFINE(TSS_sysenter_esp0, 0);
    1.13 +	DEFINE(SYSENTER_stack_esp0, 0);
    1.14  #endif
    1.15  
    1.16  	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
     2.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S	Fri Apr 21 17:35:15 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S	Fri Apr 21 17:49:10 2006 +0100
     2.3 @@ -207,7 +207,7 @@ need_resched:
     2.4  
     2.5  	# sysenter call handler stub
     2.6  ENTRY(sysenter_entry)
     2.7 -	movl TSS_sysenter_esp0(%esp),%esp
     2.8 +	movl SYSENTER_stack_esp0(%esp),%esp
     2.9  sysenter_past_esp:
    2.10  	sti
    2.11  	pushl $(__USER_DS)
    2.12 @@ -712,7 +712,7 @@ device_available_emulate:
    2.13   * that sets up the real kernel stack. Check here, since we can't
    2.14   * allow the wrong stack to be used.
    2.15   *
    2.16 - * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have
    2.17 + * "SYSENTER_stack_esp0+12" is because the NMI/debug handler will have
    2.18   * already pushed 3 words if it hits on the sysenter instruction:
    2.19   * eflags, cs and eip.
    2.20   *
    2.21 @@ -724,7 +724,7 @@ device_available_emulate:
    2.22  	cmpw $__KERNEL_CS,4(%esp);		\
    2.23  	jne ok;					\
    2.24  label:						\
    2.25 -	movl TSS_sysenter_esp0+offset(%esp),%esp;	\
    2.26 +	movl SYSENTER_stack_esp0+offset(%esp),%esp;	\
    2.27  	pushfl;					\
    2.28  	pushl $__KERNEL_CS;			\
    2.29  	pushl $sysenter_past_esp
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/patches/linux-2.6.16/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch	Fri Apr 21 17:49:10 2006 +0100
     3.3 @@ -0,0 +1,31 @@
     3.4 +Index: sysenter/linux-2.6-xen-sparse/arch/i386/kernel/entry.S
     3.5 +===================================================================
     3.6 +--- linux-2.6.16.orig/arch/i386/kernel/entry.S	2006-04-05 11:12:51.000000000 +0100
     3.7 ++++ linux-2.6.16/arch/i386/kernel/entry.S	2006-04-05 11:12:52.000000000 +0100
     3.8 +@@ -177,7 +177,7 @@
     3.9 + 
    3.10 + 	# sysenter call handler stub
    3.11 + ENTRY(sysenter_entry)
    3.12 +-	movl TSS_sysenter_esp0(%esp),%esp
    3.13 ++	movl SYSENTER_stack_esp0(%esp),%esp
    3.14 + sysenter_past_esp:
    3.15 + 	sti
    3.16 + 	pushl $(__USER_DS)
    3.17 +@@ -492,7 +492,7 @@
    3.18 +  * that sets up the real kernel stack. Check here, since we can't
    3.19 +  * allow the wrong stack to be used.
    3.20 +  *
    3.21 +- * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have
    3.22 ++ * "SYSENTER_stack_esp0+12" is because the NMI/debug handler will have
    3.23 +  * already pushed 3 words if it hits on the sysenter instruction:
    3.24 +  * eflags, cs and eip.
    3.25 +  *
    3.26 +@@ -504,7 +504,7 @@
    3.27 + 	cmpw $__KERNEL_CS,4(%esp);		\
    3.28 + 	jne ok;					\
    3.29 + label:						\
    3.30 +-	movl TSS_sysenter_esp0+offset(%esp),%esp;	\
    3.31 ++	movl SYSENTER_stack_esp0+offset(%esp),%esp;	\
    3.32 + 	pushfl;					\
    3.33 + 	pushl $__KERNEL_CS;			\
    3.34 + 	pushl $sysenter_past_esp