1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c	Tue Jan 16 19:44:09 2007 -0800
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c	Thu Jan 18 15:33:59 2007 +0000
     1.3 @@ -56,7 +56,9 @@ static void *syscall_page;
     1.4  
     1.5  int __init sysenter_setup(void)
     1.6  {
     1.7 -	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
     1.8 +	void *page = (void *)get_zeroed_page(GFP_ATOMIC);
     1.9 +
    1.10 +	syscall_page = page;
    1.11  
    1.12  #ifdef CONFIG_XEN
    1.13  	if (boot_cpu_has(X86_FEATURE_SEP)) {
    1.14 @@ -70,16 +72,16 @@ int __init sysenter_setup(void)
    1.15  	}
    1.16  #endif
    1.17  
    1.18 -	if (boot_cpu_has(X86_FEATURE_SEP)) {
    1.19 -		memcpy(syscall_page,
    1.20 -		       &vsyscall_sysenter_start,
    1.21 -		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
    1.22 +	if (!boot_cpu_has(X86_FEATURE_SEP)) {
    1.23 +		memcpy(page,
    1.24 +		       &vsyscall_int80_start,
    1.25 +		       &vsyscall_int80_end - &vsyscall_int80_start);
    1.26  		return 0;
    1.27  	}
    1.28  
    1.29 -	memcpy(syscall_page,
    1.30 -	       &vsyscall_int80_start,
    1.31 -	       &vsyscall_int80_end - &vsyscall_int80_start);
    1.32 +	memcpy(page,
    1.33 +	       &vsyscall_sysenter_start,
    1.34 +	       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
    1.35  
    1.36  	return 0;
    1.37  }