Merge branch 'upstream' into irq-pio

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 1c44b53cb15b..fb903e65e079 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -575,8 +575,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
         prev->userrsp = read_pda(oldrsp); 
         write_pda(oldrsp, next->userrsp); 
         write_pda(pcurrent, next_p); 
+
         /* This must be here to ensure both math_state_restore() and
-           kernel_fpu_begin() work consistently. */
+           kernel_fpu_begin() work consistently. 
+           And the AMD workaround requires it to be after DS reload. */
         unlazy_fpu(prev_p);
         write_pda(kernelstack,
                   task_stack_page(next_p) + THREAD_SIZE - PDA_STACKOFFSET);