1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c	Tue Feb 22 23:04:40 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c	Tue Feb 22 23:31:53 2005 +0000
     1.3 @@ -482,11 +482,8 @@ struct task_struct fastcall * __switch_t
     1.4  	asm volatile("movl %%gs,%0":"=m" (*(int *)&prev->gs));
     1.5  
     1.6  	/*
     1.7 -	 * We clobber FS and GS here so that we avoid a GPF when
     1.8 -	 * restoring previous task's FS/GS values in Xen when the LDT
     1.9 -	 * is switched. If we don't do this then we can end up
    1.10 -	 * erroneously re-flushing the page-update queue when we
    1.11 -	 * 'execute_multicall_list'.
    1.12 +	 * We clobber FS and GS here so that we avoid a GPF when restoring
    1.13 +	 * previous task's FS/GS values in Xen when the LDT is switched.
    1.14  	 */
    1.15  	__asm__ __volatile__ ( 
    1.16  		"xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs" : : :
    1.17 @@ -502,7 +499,7 @@ struct task_struct fastcall * __switch_t
    1.18  	 * synchronously trapping to Xen.
    1.19  	 */
    1.20  	if (prev_p->thread_info->status & TS_USEDFPU) {
    1.21 -		save_init_fpu(prev_p);
    1.22 +		__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
    1.23  		queue_multicall0(__HYPERVISOR_fpu_taskswitch);
    1.24  	}
    1.25  
    1.26 @@ -511,12 +508,6 @@ struct task_struct fastcall * __switch_t
    1.27  	 * This is load_esp0(tss, next) with a multicall.
    1.28  	 */
    1.29  	tss->esp0 = next->esp0;
    1.30 -	/* This can only happen when SEP is enabled, no need to test
    1.31 -	 * "SEP"arately */
    1.32 -	if (unlikely(tss->ss1 != next->sysenter_cs)) {
    1.33 -		tss->ss1 = next->sysenter_cs;
    1.34 -		wrmsr(MSR_IA32_SYSENTER_CS, next->sysenter_cs, 0);
    1.35 -	}
    1.36  	queue_multicall2(__HYPERVISOR_stack_switch, tss->ss0, tss->esp0);
    1.37  
    1.38  	/*
    1.39 @@ -550,7 +541,7 @@ struct task_struct fastcall * __switch_t
    1.40  	/*
    1.41  	 * Restore %fs and %gs if needed.
    1.42  	 */
    1.43 -	if (unlikely(prev->fs | prev->gs | next->fs | next->gs)) {
    1.44 +	if (unlikely(next->fs | next->gs)) {
    1.45  		loadsegment(fs, next->fs);
    1.46  		loadsegment(gs, next->gs);
    1.47  	}