Merge branch 'x86/mce' into x86/ras

Pursue a single RAS/MCE topic branch on x86. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2013-08-12 17:54:05 +02:00
parent bf6c216282 cf870c70a1
commit 0237d7f355
11 changed files with 150 additions and 20 deletions
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -176,6 +176,11 @@ ACPI

  acpi=noirq	Don't route interrupts

+  acpi=nocmcff	Disable firmware first mode for corrected errors. This
+		disables parsing the HEST CMC error source to check if
+		firmware has set the FF flag. This may result in
+		duplicate corrected error reports.
+
 PCI

  pci=off		Don't use PCI