Provide comand line keyword "nomca" to turn off mca processing in kernel.

Initial patch by Jesse Barnes, fixed by Ken Chen, rescued from
obscurity by Sourav Sen.

Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 8d704b412ba79aef9ae027be00d5e1bbf3b35786..9c5104cc514636f37b919749f2ef1924acd16ff4 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -130,6 +130,8 @@ static int cpe_poll_enabled = 1;
 
 extern void salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe);
 
+static int mca_init;
+
 /*
  * IA64_MCA log support
  */
@@ -1317,6 +1319,7 @@ ia64_mca_init(void)
        ia64_log_init(SAL_INFO_TYPE_CMC);
        ia64_log_init(SAL_INFO_TYPE_CPE);
 
+       mca_init = 1;
        printk(KERN_INFO "MCA related initialization done\n");
 }
 
@@ -1333,6 +1336,9 @@ ia64_mca_init(void)
 static int __init
 ia64_mca_late_init(void)
 {
+       if (!mca_init)
+               return 0;
+
        /* Setup the CMCI/P vector and handler */
        init_timer(&cmc_poll_timer);
        cmc_poll_timer.function = ia64_mca_cmc_poll;

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 462fd9f700fdbc9f80265375fa9672646c2dd467..8aff39de1b795560c53ec27dd03ac42166fb4050 100644 (file)
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -375,9 +375,10 @@ setup_arch (char **cmdline_p)
        }
 #endif
 
-       /* enable IA-64 Machine Check Abort Handling */
-       ia64_mca_init();
-
+       /* enable IA-64 Machine Check Abort Handling unless disabled */
+       if (!strstr(saved_command_line, "nomca"))
+               ia64_mca_init();
+       
        platform_setup(cmdline_p);
        paging_init();
 }