diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-13 10:21:39 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-13 10:21:39 +0100 |
| commit | 97ae166a5b4a770f6be826205723eb7fdac60cd8 (patch) | |
| tree | a0fec2ca2db3af4531b480b951344786ffa3e57f | |
| parent | db233573fba97f732b071d74a585c0135da5dac5 (diff) | |
| download | xen-97ae166a5b4a770f6be826205723eb7fdac60cd8.tar.gz xen-97ae166a5b4a770f6be826205723eb7fdac60cd8.tar.bz2 xen-97ae166a5b4a770f6be826205723eb7fdac60cd8.zip | |
mce: MCE polling logic should check mce_disabled during
initialisation.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen-unstable changeset: 21360:fa94385978e6
xen-unstable date: Wed May 12 09:09:40 2010 +0100
| -rw-r--r-- | xen/arch/x86/cpu/mcheck/non-fatal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c index 124d4aa504..2ab2b5cbc2 100644 --- 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_checker(void) struct cpuinfo_x86 *c = &boot_cpu_data; /* Check for MCE support */ - if (!mce_available(c)) + if (mce_disabled || !mce_available(c)) return -ENODEV; /* |