summaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-07 15:35:27 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-07 15:35:27 +0200
commitc2f9b0af8bb4b2a5c020ae88efc9a624f59a7080 (patch)
tree142041dd61132d487c2afddc8db32b350ee181ee /Documentation/x86
parentc8e56d20f2d190d54c0615775dcb6a23c1091681 (diff)
parent243d657eaf540db882f73497060da5a4f7d86a90 (diff)
downloadlinux-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.tar.gz
linux-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.tar.bz2
linux-c2f9b0af8bb4b2a5c020ae88efc9a624f59a7080.zip
Merge branch 'x86/ras' into x86/core, to fix conflicts
Conflicts: arch/x86/include/asm/irq_vectors.h Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/x86_64/boot-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index 5223479291a2..68ed3114c363 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -31,6 +31,9 @@ Machine check
(e.g. BIOS or hardware monitoring applications), conflicting
with OS's error handling, and you cannot deactivate the agent,
then this option will be a help.
+ mce=no_lmce
+ Do not opt-in to Local MCE delivery. Use legacy method
+ to broadcast MCEs.
mce=bootlog
Enable logging of machine checks left over from booting.
Disabled by default on AMD because some BIOS leave bogus ones.