|
@@ -1332,18 +1332,23 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void __cpuinit __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c)
|
|
|
+static int __cpuinit __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c)
|
|
|
{
|
|
|
if (c->x86 != 5)
|
|
|
- return;
|
|
|
+ return 0;
|
|
|
+
|
|
|
switch (c->x86_vendor) {
|
|
|
case X86_VENDOR_INTEL:
|
|
|
intel_p5_mcheck_init(c);
|
|
|
+ return 1;
|
|
|
break;
|
|
|
case X86_VENDOR_CENTAUR:
|
|
|
winchip_mcheck_init(c);
|
|
|
+ return 1;
|
|
|
break;
|
|
|
}
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)
|
|
@@ -1397,7 +1402,8 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
|
|
|
if (mce_disabled)
|
|
|
return;
|
|
|
|
|
|
- __mcheck_cpu_ancient_init(c);
|
|
|
+ if (__mcheck_cpu_ancient_init(c))
|
|
|
+ return;
|
|
|
|
|
|
if (!mce_available(c))
|
|
|
return;
|