AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-22 16:29:51 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86, mce: rename 64bit mce_dont_init to mce_disabled

Browse Source 
Give it the same name as on 32bit. This makes further merging easier.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Andi Kleen 2009-04-28 22:50:19 +02:00 committed by H. Peter Anvin
parent 5d7279268b
commit 04b2b1a4df
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/mce.h
View File

@ -86,9 +86,7 @@ struct mce_log {
#ifdef __KERNEL__
#ifdef CONFIG_X86_32
extern int mce_disabled;
#endif
#include <asm/atomic.h>

15
arch/x86/kernel/cpu/mcheck/mce.c
View File

@ -49,14 +49,15 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
/* Call the installed machine check handler for this CPU setup. */
void (*machine_check_vector)(struct pt_regs *, long error_code) =
unexpected_machine_check;
int mce_disabled;
#ifdef CONFIG_X86_64
#define MISC_MCELOG_MINOR 227
atomic_t mce_entry;
static int mce_dont_init;
/*
* Tolerant levels:
* 0: always panic on uncorrected errors, log corrected errors
@ -194,7 +195,7 @@ static void mce_panic(char *msg, struct mce *backup, u64 start)
int mce_available(struct cpuinfo_x86 *c)
{
if (mce_dont_init)
if (mce_disabled)
return 0;
return cpu_has(c, X86_FEATURE_MCE) && cpu_has(c, X86_FEATURE_MCA);
}
@ -720,7 +721,7 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c)
return;
if (mce_cap_init() < 0) {
mce_dont_init = 1;
mce_disabled = 1;
return;
}
mce_cpu_quirks(c);
@ -911,7 +912,7 @@ static struct miscdevice mce_log_device = {
*/
static int __init mcheck_disable(char *str)
{
mce_dont_init = 1;
mce_disabled = 1;
return 1;
}
__setup("nomce", mcheck_disable);
@ -925,7 +926,7 @@ __setup("nomce", mcheck_disable);
static int __init mcheck_enable(char *str)
{
if (!strcmp(str, "off"))
mce_dont_init = 1;
mce_disabled = 1;
else if (!strcmp(str, "bootlog") || !strcmp(str, "nobootlog"))
mce_bootlog = (str[0] == 'b');
else if (isdigit(str[0]))
@ -1292,8 +1293,6 @@ device_initcall(mce_init_device);
#else /* CONFIG_X86_32: */
int mce_disabled;
int nr_mce_banks;
EXPORT_SYMBOL_GPL(nr_mce_banks); /* non-fatal.o */