x86/entry/32: Pull the MSR_IA32_SYSENTER_CS update code out of native_load_sp0()

[linux.git] / arch / x86 / kernel / process_32.c

diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 11966251cd4259b871203636953e4897e8bd67ab..0936ed3da6b693173ff16006b3b02185ab3ff6ba 100644 (file)
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -284,9 +284,11 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
 
        /*
         * Reload esp0 and cpu_current_top_of_stack.  This changes
-        * current_thread_info().
+        * current_thread_info().  Refresh the SYSENTER configuration in
+        * case prev or next is vm86.
         */
        load_sp0(tss, next);
+       refresh_sysenter_cs(next);
        this_cpu_write(cpu_current_top_of_stack,
                       (unsigned long)task_stack_page(next_p) +
                       THREAD_SIZE);