Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / kernel / cpu / common.c

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 080f4a737e3e798f53f69e68f2cbd0f81df83af4..532691b6c8fe232f66c46c72b0a191ce17dd6e15 100644 (file)
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -144,6 +144,8 @@ static int __init x86_xsave_setup(char *s)
 {
        setup_clear_cpu_cap(X86_FEATURE_XSAVE);
        setup_clear_cpu_cap(X86_FEATURE_XSAVEOPT);
+       setup_clear_cpu_cap(X86_FEATURE_AVX);
+       setup_clear_cpu_cap(X86_FEATURE_AVX2);
        return 1;
 }
 __setup("noxsave", x86_xsave_setup);
@@ -1020,14 +1022,16 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)
                printk(KERN_CONT "%s ", vendor);
 
        if (c->x86_model_id[0])
-               printk(KERN_CONT "%s", c->x86_model_id);
+               printk(KERN_CONT "%s", strim(c->x86_model_id));
        else
                printk(KERN_CONT "%d86", c->x86);
 
+       printk(KERN_CONT " (fam: %02x, model: %02x", c->x86, c->x86_model);
+
        if (c->x86_mask || c->cpuid_level >= 0)
-               printk(KERN_CONT " stepping %02x\n", c->x86_mask);
+               printk(KERN_CONT ", stepping: %02x)\n", c->x86_mask);
        else
-               printk(KERN_CONT "\n");
+               printk(KERN_CONT ")\n");
 
        print_cpu_msr(c);
 }
@@ -1113,8 +1117,6 @@ void syscall_init(void)
               X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_IOPL);
 }
 
-unsigned long kernel_eflags;
-
 /*
  * Copies of the original ist values from the tss are only accessed during
  * debugging, no special alignment required.
@@ -1294,9 +1296,6 @@ void __cpuinit cpu_init(void)
        dbg_restore_debug_regs();
 
        fpu_init();
-       xsave_init();
-
-       raw_local_save_flags(kernel_eflags);
 
        if (is_uv_system())
                uv_cpu_init();
@@ -1349,6 +1348,5 @@ void __cpuinit cpu_init(void)
        dbg_restore_debug_regs();
 
        fpu_init();
-       xsave_init();
 }
 #endif