diff options
| author | Ingo Molnar | 2013-08-12 17:54:05 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-08-12 17:54:05 +0200 |
| commit | 0237d7f355eef4d9ab8557e1597e8c9debd6c8c2 (patch) | |
| tree | 753837a9fb9e3f65bc7450994159683a47f086a6 /Documentation/x86 | |
| parent | Merge tag 'ras_for_3.12' into x86/ras (diff) | |
| parent | mce: acpi/apei: Soft-offline a page on firmware GHES notification (diff) | |
| download | kernel-qcow2-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.tar.gz kernel-qcow2-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.tar.xz kernel-qcow2-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.zip | |
Merge branch 'x86/mce' into x86/ras
Pursue a single RAS/MCE topic branch on x86.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
| -rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index e9e8ddbbf376..1228b22e142b 100644 --- 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 |