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

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

x86, mce: unify 



move mce_64.c => mce.c and glue it up in the Makefile.
Remove mce_32.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 711c2e48

arch/x86/kernel/cpu/mcheck/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y				=  mce_$(BITS).o therm_throt.o

obj-y				=  mce.o therm_throt.o



obj-$(CONFIG_X86_32)		+= k7.o p4.o p5.o p6.o winchip.o

obj-$(CONFIG_X86_MCE_P4THERMAL)	+= mce_intel.o

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

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/*

 * mce.c - x86 Machine Check Exception Reporting

 * (c) 2002 Alan Cox <alan@lxorguk.ukuu.org.uk>, Dave Jones <davej@redhat.com>

 */

#include <linux/thread_info.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/smp.h>



#include <asm/processor.h>

#include <asm/system.h>

#include <asm/mce.h>



#include "mce.h"



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);