diff options
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index c7e46cb3532..0bab2b18bb2 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -442,8 +442,6 @@ static void __cpuinit bsp_init_amd(struct cpuinfo_x86 *c)  static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)  { -	u32 dummy; -  	early_init_amd_mc(c);  	/* @@ -473,12 +471,12 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)  			set_cpu_cap(c, X86_FEATURE_EXTD_APICID);  	}  #endif - -	rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);  }  static void __cpuinit init_amd(struct cpuinfo_x86 *c)  { +	u32 dummy; +  #ifdef CONFIG_SMP  	unsigned long long value; @@ -657,6 +655,8 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)  			checking_wrmsrl(MSR_AMD64_MCx_MASK(4), mask);  		}  	} + +	rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);  }  #ifdef CONFIG_X86_32  |