Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a988d334 authored by Ingo Molnar's avatar Ingo Molnar Committed by H. Peter Anvin
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@firstfloor.org>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 06b851d9

arch/x86/kernel/cpu/mcheck/mce_64.c

+65 −0
Original line number Diff line number Diff line
@@ -1240,3 +1240,68 @@ static __init int mce_init_device(void) 
}



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 */