aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-08-09 16:20:49 -0500
committerJames Bottomley <jejb@titanic.(none)>2005-08-09 16:20:49 -0500
commit471417c9cfb4c2574e2c03bf2273fe12f5388a8e (patch)
treeac026ba976bc253fc87a5cdec8f33d24d03e1c9c /Documentation
parent20e007b8cc1266ff78810457d6e26c35c6b810ba (diff)
parentdb29e85a7ece62de1899917c1ec0ffe55cf1d3a0 (diff)
Merge ../linux-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/x86_64/boot-options.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 476c0c22fbb..678e8f192db 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -6,6 +6,11 @@ only the AMD64 specific ones are listed here.
Machine check
mce=off disable machine check
+ mce=bootlog Enable logging of machine checks left over from booting.
+ Disabled by default because some BIOS leave bogus ones.
+ If your BIOS doesn't do that it's a good idea to enable though
+ to make sure you log even machine check events that result
+ in a reboot.
nomce (for compatibility with i386): same as mce=off