From: Horms <horms@verge.net.au>
Date: Wed, 22 Feb 2006 00:57:55 +0000 (+0900)
Subject: [IA64] Document the "nomca" boot parameter
X-Git-Tag: v2.6.16-rc6~141^2~7
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=312f1f0141627a58bf72c55f0e7bc5d6f118a372;p=linux-2.6-omap-h63xx.git

[IA64] Document the "nomca" boot parameter

"nomca" can be used to disable machine check handling

Signed-Off-By: Horms <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b874771385c..75205391b33 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1034,6 +1034,8 @@ running once the system is up.
 
 	nomce		[IA-32] Machine Check Exception
 
+	nomca		[IA-64] Disable machine check abort handling
+
 	noresidual	[PPC] Don't use residual data on PReP machines.
 
 	noresume	[SWSUSP] Disables resume and restores original swap