21 lines
626 B
Diff
21 lines
626 B
Diff
|
# HG changeset patch
|
||
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
||
|
|
# Date 1273651780 -3600
|
||
|
|
# Node ID fa94385978e6317732e2c12000923ca6a5e0d2ed
|
||
|
|
# Parent 0079f76e906f378f81044da4e135df2fbb878fa5
|
||
|
|
mce: MCE polling logic should check mce_disabled during initialisation.
|
||
|
|
|
||
|
|
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
|
||
|
|
|
||
|
|
--- a/xen/arch/x86/cpu/mcheck/non-fatal.c
|
||
|
|
+++ b/xen/arch/x86/cpu/mcheck/non-fatal.c
|
||
|
|
@@ -91,7 +91,7 @@ static int __init init_nonfatal_mce_chec
|
||
|
|
struct cpuinfo_x86 *c = &boot_cpu_data;
|
||
|
|
|
||
|
|
/* Check for MCE support */
|
||
|
|
- if (!mce_available(c))
|
||
|
|
+ if (mce_disabled || !mce_available(c))
|
||
|
|
return -ENODEV;
|
||
|
|
|
||
|
|
/*
|