X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fia64%2Fkernel%2Fsetup.c;h=462fd9f700fdbc9f80265375fa9672646c2dd467;hb=90ad8654ffeb336af8c878fdf7bc72e2ac72467a;hp=8aff39de1b795560c53ec27dd03ac42166fb4050;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

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