aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2023-02-02 18:30:06 +0100
committerArd Biesheuvel <ardb@kernel.org>2023-02-02 18:32:25 +0100
commit636ab417a7aec4ee993916e688eb5c5977570836 (patch)
tree38746293a91ccc50632cab161bb13e1177c6fc90
parente1fabbc83cb1dd4ba63932faa86c9cacb8bf791e (diff)
downloadlinux-636ab417a7aec4ee993916e688eb5c5977570836.tar.gz
efi: Accept version 2 of memory attributes table
UEFI v2.10 introduces version 2 of the memory attributes table, which turns the reserved field into a flags field, but is compatible with version 1 in all other respects. So let's not complain about version 2 if we encounter it. Cc: <stable@vger.kernel.org> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-rw-r--r--drivers/firmware/efi/memattr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/memattr.c b/drivers/firmware/efi/memattr.c
index 0a9aba5f9ceff0..f178b2984dfb2a 100644
--- a/drivers/firmware/efi/memattr.c
+++ b/drivers/firmware/efi/memattr.c
@@ -33,7 +33,7 @@ int __init efi_memattr_init(void)
return -ENOMEM;
}
- if (tbl->version > 1) {
+ if (tbl->version > 2) {
pr_warn("Unexpected EFI Memory Attributes table version %d\n",
tbl->version);
goto unmap;