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

Commit d7c3c9a6 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

x86, mce: move mce_disabled option into common 32bit/64bit code 



It's the same function, so let's share it.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 04b2b1a4

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

+11 −18
Original line number Diff line number Diff line
@@ -907,16 +907,6 @@ static struct miscdevice mce_log_device = { 
	&mce_chrdev_ops,

};



/*

 * Old style boot options parsing. Only for compatibility.

 */

static int __init mcheck_disable(char *str)

{

	mce_disabled = 1;

	return 1;

}

__setup("nomce", mcheck_disable);



/*

 * mce=off disables machine check

 * mce=TOLERANCELEVEL (number, see above)
@@ -1327,19 +1317,22 @@ void mcheck_init(struct cpuinfo_x86 *c) 
	printk(KERN_INFO "mce: CPU supports %d MCE banks\n", nr_mce_banks);

}



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 */
 
#endif /* CONFIG_X86_OLD_MCE */



/*

 * Old style boot options parsing. Only for compatibility.

 */

static int __init mcheck_disable(char *str)

{

	mce_disabled = 1;

	return 1;

}

__setup("nomce", mcheck_disable);