summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHorms <horms@verge.net.au>2006-02-22 01:57:55 +0100
committerTony Luck <tony.luck@intel.com>2006-02-28 00:29:57 +0100
commit312f1f0141627a58bf72c55f0e7bc5d6f118a372 (patch)
tree5a5bca4b1e7dabffd9c0fc2f34e0c36261e8a19e
parent[IA64] Delete a redundant instruction in unaligned_access (diff)
downloadlinux-312f1f0141627a58bf72c55f0e7bc5d6f118a372.tar.xz
linux-312f1f0141627a58bf72c55f0e7bc5d6f118a372.zip
[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>
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index b874771385cd..75205391b335 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