Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2035cfb9 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Greg Kroah-Hartman
Browse files

efi: Accept version 2 of memory attributes table 



commit 636ab417a7aec4ee993916e688eb5c5977570836 upstream.

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: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6ea834e

drivers/firmware/efi/memattr.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,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;