ia64/xen-unstable

changeset 10299:90a8ab269afe

A few put_cpu() calls were missed when adding CONFIG_X86_NO_TSS.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jun 02 13:36:29 2006 +0100 (2006-06-02)
parents d8363da485ce
children fdc26ec44145
files linux-2.6-xen-sparse/arch/i386/kernel/vm86.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/vm86.c	Fri Jun 02 12:19:33 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/vm86.c	Fri Jun 02 13:36:29 2006 +0100
     1.3 @@ -132,7 +132,9 @@ struct pt_regs * fastcall save_v86_state
     1.4  	current->thread.sysenter_cs = __KERNEL_CS;
     1.5  	load_esp0(tss, &current->thread);
     1.6  	current->thread.saved_esp0 = 0;
     1.7 +#ifndef CONFIG_X86_NO_TSS
     1.8  	put_cpu();
     1.9 +#endif
    1.10  
    1.11  	loadsegment(fs, current->thread.saved_fs);
    1.12  	loadsegment(gs, current->thread.saved_gs);
    1.13 @@ -310,7 +312,9 @@ static void do_sys_vm86(struct kernel_vm
    1.14  	if (cpu_has_sep)
    1.15  		tsk->thread.sysenter_cs = 0;
    1.16  	load_esp0(tss, &tsk->thread);
    1.17 +#ifndef CONFIG_X86_NO_TSS
    1.18  	put_cpu();
    1.19 +#endif
    1.20  
    1.21  	tsk->thread.screen_bitmap = info->screen_bitmap;
    1.22  	if (info->flags & VM86_SCREEN_BITMAP)