mce: Allow mce to be disabled by no-mce as well as nomce.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index e6c41cbb4878f6b14cd5fcfd7fdc53541a974011..573510d7a68af5b86a8a2d7f179b7c0f33257a68 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -22,8 +22,9 @@
 
 #include "mce.h"
 
-int mce_disabled = 0;
-int is_mc_panic = 0;
+int mce_disabled;
+invbool_param("mce", mce_disabled);
+int is_mc_panic;
 unsigned int nr_mce_banks;
 
 EXPORT_SYMBOL_GPL(nr_mce_banks);       /* non-fatal.o */
@@ -606,13 +607,7 @@ static void __init mcheck_disable(char *str)
        mce_disabled = 1;
 }
 
-static void __init mcheck_enable(char *str)
-{
-       mce_disabled = -1;
-}
-
 custom_param("nomce", mcheck_disable);
-custom_param("mce", mcheck_enable);
 
 static void mcinfo_clear(struct mc_info *mi)
 {