From dd9f789cb6ce7f512a06fb2ebd013a52ca6cbf9f Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 2 Jun 2006 13:36:29 +0100 Subject: [PATCH] A few put_cpu() calls were missed when adding CONFIG_X86_NO_TSS. Signed-off-by: Jan Beulich --- linux-2.6-xen-sparse/arch/i386/kernel/vm86.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/vm86.c b/linux-2.6-xen-sparse/arch/i386/kernel/vm86.c index c1e240926d..0e3a0d46c8 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/vm86.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/vm86.c @@ -132,7 +132,9 @@ struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs) current->thread.sysenter_cs = __KERNEL_CS; load_esp0(tss, ¤t->thread); current->thread.saved_esp0 = 0; +#ifndef CONFIG_X86_NO_TSS put_cpu(); +#endif loadsegment(fs, current->thread.saved_fs); loadsegment(gs, current->thread.saved_gs); @@ -310,7 +312,9 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk if (cpu_has_sep) tsk->thread.sysenter_cs = 0; load_esp0(tss, &tsk->thread); +#ifndef CONFIG_X86_NO_TSS put_cpu(); +#endif tsk->thread.screen_bitmap = info->screen_bitmap; if (info->flags & VM86_SCREEN_BITMAP) -- 2.30.2