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

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

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: 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 a988d334

arch/x86/kernel/cpu/mcheck/mce.h

+2 −2
Original line number Diff line number Diff line 
#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);

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

+5 −1
Original line number Diff line number Diff line
@@ -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;