Merge branch 'x86/fpu' into x86/smap
[linux-3.10.git] / arch / x86 / kernel / cpu / common.c
index 7d35d65..44aec5d 100644 (file)
@@ -1324,7 +1324,6 @@ void __cpuinit cpu_init(void)
        dbg_restore_debug_regs();
 
        fpu_init();
-       xsave_init();
 
        raw_local_save_flags(kernel_eflags);
 
@@ -1379,6 +1378,5 @@ void __cpuinit cpu_init(void)
        dbg_restore_debug_regs();
 
        fpu_init();
-       xsave_init();
 }
 #endif