diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 10:22:08 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-27 10:22:08 +0300 |
commit | bdac4d8abbfc239886103f7c6ee03abb8011a008 (patch) | |
tree | fda39ff9008b28d574ccd647f41a243183663127 /drivers/firmware/efi/mokvar-table.c | |
parent | e7deeb9d79d8691f1e6c4c6707471ec3d7b9886b (diff) | |
parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
download | linux-bdac4d8abbfc239886103f7c6ee03abb8011a008.tar.xz |
Merge 5.14-rc3 into driver-core-next
We need the driver-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/efi/mokvar-table.c')
-rw-r--r-- | drivers/firmware/efi/mokvar-table.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/firmware/efi/mokvar-table.c b/drivers/firmware/efi/mokvar-table.c index d8bc01340686..38722d2009e2 100644 --- a/drivers/firmware/efi/mokvar-table.c +++ b/drivers/firmware/efi/mokvar-table.c @@ -180,7 +180,10 @@ void __init efi_mokvar_table_init(void) pr_err("EFI MOKvar config table is not valid\n"); return; } - efi_mem_reserve(efi.mokvar_table, map_size_needed); + + if (md.type == EFI_BOOT_SERVICES_DATA) + efi_mem_reserve(efi.mokvar_table, map_size_needed); + efi_mokvar_table_size = map_size_needed; } |