[Xen-changelog] [xen-3.4-testing] mce: Allow mce to be disabled by no-mce as well as nomce.

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273743218 -3600
# Node ID 595003757412734952b1577fc4f5820275bd3563
# Parent  7e9466ec4daef93cc0f593b68850da603d8fe90e
mce: Allow mce to be disabled by no-mce as well as nomce.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/cpu/mcheck/mce.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff -r 7e9466ec4dae -r 595003757412 xen/arch/x86/cpu/mcheck/mce.c
--- a/xen/arch/x86/cpu/mcheck/mce.c     Thu May 13 10:28:32 2010 +0100
+++ b/xen/arch/x86/cpu/mcheck/mce.c     Thu May 13 10:33:38 2010 +0100
@@ -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 *
        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)
 {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog