From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 8 Mar 2020 08:57:58 +0000 (+0100)
Subject: Merge branch 'efi/urgent' into efi/core, to pick up fixes
X-Git-Tag: io_uring-5.7-2020-04-09~29^2~22
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6120681bdf1a1c648e8c555704b71e04abe2e899;p=linux-block.git

Merge branch 'efi/urgent' into efi/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

6120681bdf1a1c648e8c555704b71e04abe2e899
diff --cc drivers/firmware/efi/efi.c
index 1d5e9a030cb1,21ea99f65113..3f41947a4d66
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@@ -580,9 -550,9 +580,9 @@@ int __init efi_config_parse_tables(cons
  		struct linux_efi_random_seed *seed;
  		u32 size = 0;
  
 -		seed = early_memremap(efi.rng_seed, sizeof(*seed));
 +		seed = early_memremap(efi_rng_seed, sizeof(*seed));
  		if (seed != NULL) {
- 			size = seed->size;
+ 			size = READ_ONCE(seed->size);
  			early_memunmap(seed, sizeof(*seed));
  		} else {
  			pr_err("Could not map UEFI random seed!\n");