===== arch/ia64/kernel/setup.c 1.70 vs edited =====
--- 1.70/arch/ia64/kernel/setup.c	Wed Mar 17 04:46:59 2004
+++ edited/arch/ia64/kernel/setup.c	Tue May  4 09:23:34 2004
@@ -283,6 +283,9 @@
 void __init
 setup_arch (char **cmdline_p)
 {
+	char *cp;
+	int nomca = 0;
+
 	unw_init();
 
 	ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist);
@@ -359,9 +362,19 @@
 		conswitchp = &vga_con;
 # endif
 #endif
-
-	/* enable IA-64 Machine Check Abort Handling */
-	ia64_mca_init();
+	for (cp = saved_command_line; *cp; )
+		if (memcmp(cp, "nomca", 5) == 0)
+			nomca = 1;
+		else {
+			while (*cp != ' ' && *cp)
+				++cp;
+			while (*cp == ' ')
+				++cp;
+		}
+
+	/* enable IA-64 Machine Check Abort Handling unless disabled */
+	if (!nomca)
+		ia64_mca_init();
 
 	platform_setup(cmdline_p);
 	paging_init();