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

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

diff --cc arch/x86/platform/efi/efi_64.c
Simple merge

diff --cc drivers/firmware/efi/efi.c
index 1d5e9a030cb19b6c4b006c22fabf5aa56a29fcf1,21ea99f651134be47161831266f00cb43fb85f56..3f41947a4d664eeb4f74c5442cf5f46d6075dd4e
--- 1/drivers/firmware/efi/efi.c
--- 2/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");

diff --cc drivers/firmware/efi/efivars.c
Simple merge