summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-15 10:55:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-15 10:55:33 -0800
commitf4e087c666f54559cb4e530af1fbfc9967e14a15 (patch)
tree0115522f1539abf8e62d262d571210ea5f300a1d /Documentation
parentdcda487c9c2e80ad177cdc34ae2068bbe5dada07 (diff)
parent179892adb0436139fd8e6af7b27f54219c1750f8 (diff)
downloadlinux-stable-f4e087c666f54559cb4e530af1fbfc9967e14a15.tar.gz
linux-stable-f4e087c666f54559cb4e530af1fbfc9967e14a15.tar.bz2
linux-stable-f4e087c666f54559cb4e530af1fbfc9967e14a15.zip
Merge tag 'acpi-5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "These address a device ID bounds check error in the device enumeration code and fix a mistake in the documentation. Specifics: - Harden the ACPI device enumeration code against device ID length overflows to address a Linux VM cash on Hyper-V (Dexuan Cui). - Fix a mistake in the documentation of error type values for PCIe errors (Qiuxu Zhuo)" * tag 'acpi-5.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: Documentation: ACPI: EINJ: Fix error type values for PCIe errors ACPI: scan: Harden acpi_device_add() against device ID overflows
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/firmware-guide/acpi/apei/einj.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/firmware-guide/acpi/apei/einj.rst b/Documentation/firmware-guide/acpi/apei/einj.rst
index e588bccf5158..c042176e1707 100644
--- a/Documentation/firmware-guide/acpi/apei/einj.rst
+++ b/Documentation/firmware-guide/acpi/apei/einj.rst
@@ -50,8 +50,8 @@ The following files belong to it:
0x00000010 Memory Uncorrectable non-fatal
0x00000020 Memory Uncorrectable fatal
0x00000040 PCI Express Correctable
- 0x00000080 PCI Express Uncorrectable fatal
- 0x00000100 PCI Express Uncorrectable non-fatal
+ 0x00000080 PCI Express Uncorrectable non-fatal
+ 0x00000100 PCI Express Uncorrectable fatal
0x00000200 Platform Correctable
0x00000400 Platform Uncorrectable non-fatal
0x00000800 Platform Uncorrectable fatal