#ifndef CONFIG_X86_NO_TSS 
-       tss = &per_cpu(init_tss, get_cpu()); 
+       tss = __get_cpu_tss(get_cpu());
 #endif

--- ./arch/i386/kernel/vm86.c.ve2555    2007-06-08 19:38:56.000000000 +0400
+++ ./arch/i386/kernel/vm86.c   2007-06-13 12:26:23.000000000 +0400
@@ -129,9 +129,7 @@ struct pt_regs * fastcall save_v86_state
 #endif
        current->thread.esp0 = current->thread.saved_esp0;
        current->thread.sysenter_cs = __KERNEL_CS;
-#ifndef CONFIG_X86_NO_TSS
        load_virtual_esp0(tss, current);
-#endif
        current->thread.saved_esp0 = 0;
 #ifndef CONFIG_X86_NO_TSS
        put_cpu();
@@ -313,8 +311,8 @@ static void do_sys_vm86(struct kernel_vm
        if (cpu_has_sep)
                tsk->thread.sysenter_cs = 0;

-#ifndef CONFIG_X86_NO_TSS
        load_virtual_esp0(tss, tsk);
+#ifndef CONFIG_X86_NO_TSS
        put_cpu();
 #endif