From 2ba4d5f79e32d5a88fd117d295525bdb42a4b098 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Fri, 24 Apr 2009 00:50:27 -0700 Subject: [PATCH] --- yaml --- r: 158714 b: refs/heads/master c: 16d9dbf0c2bd167fdd942b83592d59696c7b73bd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/process_64.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 957f633be4ea..bf8232c5ea86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fcddce10f6771cfa0c56fd1e826d50d67d100b7 +refs/heads/master: 16d9dbf0c2bd167fdd942b83592d59696c7b73bd diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c index ebefb5407b9d..c9b8904736db 100644 --- a/trunk/arch/x86/kernel/process_64.c +++ b/trunk/arch/x86/kernel/process_64.c @@ -419,6 +419,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) load_TLS(next, cpu); + /* Must be after DS reload */ + unlazy_fpu(prev_p); + /* * Leave lazy mode, flushing any hypercalls made here. * This must be done before restoring TLS segments so @@ -459,9 +462,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) wrmsrl(MSR_KERNEL_GS_BASE, next->gs); prev->gsindex = gsindex; - /* Must be after DS reload */ - unlazy_fpu(prev_p); - /* * Switch the PDA and FPU contexts. */