openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86, mce: unify, prepare for 32-bit v2 

Prepare the 64-bit mce_64.c code side to be built on 32-bit.

[ includes ifdef relocation 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:
Ingo Molnar 2009-04-08 12:31:26 +02:00 committed by H. Peter Anvin
parent a988d334ae
commit 711c2e481c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/cpu/mcheck/mce.h
View File

@ -1,14 +1,14 @@
#include <linux/init.h>
#include <asm/mce.h>
#ifdef CONFIG_X86_32
void amd_mcheck_init(struct cpuinfo_x86 *c);
void intel_p4_mcheck_init(struct cpuinfo_x86 *c);
void intel_p5_mcheck_init(struct cpuinfo_x86 *c);
void intel_p6_mcheck_init(struct cpuinfo_x86 *c);
void winchip_mcheck_init(struct cpuinfo_x86 *c);
#ifdef CONFIG_X86_32
/* Call the installed machine check handler for this CPU setup. */
extern void (*machine_check_vector)(struct pt_regs *, long error_code);

6
arch/x86/kernel/cpu/mcheck/mce_64.c
View File

@ -37,6 +37,10 @@
#include <asm/msr.h>
#include <asm/smp.h>
#include "mce.h"
#ifdef CONFIG_X86_64
#define MISC_MCELOG_MINOR 227
atomic_t mce_entry;
@ -1241,7 +1245,7 @@ static __init int mce_init_device(void)
device_initcall(mce_init_device);
#ifdef CONFIG_X86_32
#else /* CONFIG_X86_32: */
int mce_disabled;