mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
x86, mce: unify, prepare codes
Move current 32-bit mce_32.c code into mce_64.c. [ Remove unused artifact stop/restart_mce pointed by Andi Kleen ] Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Andi Kleen <ak@firstfloor.org> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
parent
06b851d982
commit
a988d334ae
1 changed files with 65 additions and 0 deletions
|
@ -1240,3 +1240,68 @@ static __init int mce_init_device(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
device_initcall(mce_init_device);
|
device_initcall(mce_init_device);
|
||||||
|
|
||||||
|
#ifdef CONFIG_X86_32
|
||||||
|
|
||||||
|
int mce_disabled;
|
||||||
|
|
||||||
|
int nr_mce_banks;
|
||||||
|
EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */
|
||||||
|
|
||||||
|
/* Handle unconfigured int18 (should never happen) */
|
||||||
|
static void unexpected_machine_check(struct pt_regs *regs, long error_code)
|
||||||
|
{
|
||||||
|
printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n",
|
||||||
|
smp_processor_id());
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Call the installed machine check handler for this CPU setup. */
|
||||||
|
void (*machine_check_vector)(struct pt_regs *, long error_code) =
|
||||||
|
unexpected_machine_check;
|
||||||
|
|
||||||
|
/* This has to be run for each processor */
|
||||||
|
void mcheck_init(struct cpuinfo_x86 *c)
|
||||||
|
{
|
||||||
|
if (mce_disabled == 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
switch (c->x86_vendor) {
|
||||||
|
case X86_VENDOR_AMD:
|
||||||
|
amd_mcheck_init(c);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case X86_VENDOR_INTEL:
|
||||||
|
if (c->x86 == 5)
|
||||||
|
intel_p5_mcheck_init(c);
|
||||||
|
if (c->x86 == 6)
|
||||||
|
intel_p6_mcheck_init(c);
|
||||||
|
if (c->x86 == 15)
|
||||||
|
intel_p4_mcheck_init(c);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case X86_VENDOR_CENTAUR:
|
||||||
|
if (c->x86 == 5)
|
||||||
|
winchip_mcheck_init(c);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __init mcheck_disable(char *str)
|
||||||
|
{
|
||||||
|
mce_disabled = 1;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __init mcheck_enable(char *str)
|
||||||
|
{
|
||||||
|
mce_disabled = -1;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
__setup("nomce", mcheck_disable);
|
||||||
|
__setup("mce", mcheck_enable);
|
||||||
|
|
||||||
|
#endif /* CONFIG_X86_32 */
|
||||||
|
|
Loading…
Reference in a new issue