1 files changed, 16 insertions, 16 deletions

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index eccdb57094e3..e7e35219b32f 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -31,24 +31,22 @@ struct kmem_cache *task_xstate_cachep;
 
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 {
+        int ret;
+
         *dst = *src;
-        if (src->thread.xstate) {
-                dst->thread.xstate = kmem_cache_alloc(task_xstate_cachep,
-                                                      GFP_KERNEL);
-                if (!dst->thread.xstate)
-                        return -ENOMEM;
-                WARN_ON((unsigned long)dst->thread.xstate & 15);
-                memcpy(dst->thread.xstate, src->thread.xstate, xstate_size);
+        if (fpu_allocated(&src->thread.fpu)) {
+                memset(&dst->thread.fpu, 0, sizeof(dst->thread.fpu));
+                ret = fpu_alloc(&dst->thread.fpu);
+                if (ret)
+                        return ret;
+                fpu_copy(&dst->thread.fpu, &src->thread.fpu);
         }
         return 0;
 }
 
 void free_thread_xstate(struct task_struct *tsk)
 {
-        if (tsk->thread.xstate) {
-                kmem_cache_free(task_xstate_cachep, tsk->thread.xstate);
-                tsk->thread.xstate = NULL;
-        }
+        fpu_free(&tsk->thread.fpu);
 }
 
 void free_thread_info(struct thread_info *ti)
@@ -548,11 +546,13 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
                  * check OSVW bit for CPUs that are not affected
                  * by erratum #400
                  */
-                rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, val);
-                if (val >= 2) {
-                        rdmsrl(MSR_AMD64_OSVW_STATUS, val);
-                        if (!(val & BIT(1)))
-                                goto no_c1e_idle;
+                if (cpu_has(c, X86_FEATURE_OSVW)) {
+                        rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, val);
+                        if (val >= 2) {
+                                rdmsrl(MSR_AMD64_OSVW_STATUS, val);
+                                if (!(val & BIT(1)))
+                                        goto no_c1e_idle;
+                        }
                 }
                 return 1;
         }