|
@@ -442,8 +442,6 @@ static void __cpuinit bsp_init_amd(struct cpuinfo_x86 *c)
|
|
|
|
|
|
static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
|
|
static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
|
|
{
|
|
{
|
|
- u32 dummy;
|
|
|
|
-
|
|
|
|
early_init_amd_mc(c);
|
|
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);
|
|
set_cpu_cap(c, X86_FEATURE_EXTD_APICID);
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
-
|
|
|
|
- rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static void __cpuinit init_amd(struct cpuinfo_x86 *c)
|
|
static void __cpuinit init_amd(struct cpuinfo_x86 *c)
|
|
{
|
|
{
|
|
|
|
+ u32 dummy;
|
|
|
|
+
|
|
#ifdef CONFIG_SMP
|
|
#ifdef CONFIG_SMP
|
|
unsigned long long value;
|
|
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);
|
|
checking_wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_X86_32
|
|
#ifdef CONFIG_X86_32
|