x86, mce: don't disable machine checks during code patching
Impact: low priority bug fix
This removes part of a a patch I added myself some time ago. After some
consideration the patch was a bad idea. In particular it stopped machine check
exceptions during code patching.
To quote the comment:
* MCEs only happen when something got corrupted and in this
* case we must do something about the corruption.
* Ignoring it is worse than a unlikely patching race.
* Also machine checks tend to be broadcast and if one CPU
* goes into machine check the others follow quickly, so we don't
* expect a machine check to cause undue problems during to code
* patching.
So undo the machine check related parts of
8f4e956b31
NMIs are still disabled.
This only removes code, the only additions are a new comment.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:

committed by
H. Peter Anvin

parent
973a2dd1d5
commit
123aa76ec0
@@ -60,20 +60,6 @@ void mcheck_init(struct cpuinfo_x86 *c)
|
||||
}
|
||||
}
|
||||
|
||||
static unsigned long old_cr4 __initdata;
|
||||
|
||||
void __init stop_mce(void)
|
||||
{
|
||||
old_cr4 = read_cr4();
|
||||
clear_in_cr4(X86_CR4_MCE);
|
||||
}
|
||||
|
||||
void __init restart_mce(void)
|
||||
{
|
||||
if (old_cr4 & X86_CR4_MCE)
|
||||
set_in_cr4(X86_CR4_MCE);
|
||||
}
|
||||
|
||||
static int __init mcheck_disable(char *str)
|
||||
{
|
||||
mce_disabled = 1;
|
||||
|
@@ -680,20 +680,6 @@ static struct miscdevice mce_log_device = {
|
||||
&mce_chrdev_ops,
|
||||
};
|
||||
|
||||
static unsigned long old_cr4 __initdata;
|
||||
|
||||
void __init stop_mce(void)
|
||||
{
|
||||
old_cr4 = read_cr4();
|
||||
clear_in_cr4(X86_CR4_MCE);
|
||||
}
|
||||
|
||||
void __init restart_mce(void)
|
||||
{
|
||||
if (old_cr4 & X86_CR4_MCE)
|
||||
set_in_cr4(X86_CR4_MCE);
|
||||
}
|
||||
|
||||
/*
|
||||
* Old style boot options parsing. Only for compatibility.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user