diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-07-23 00:46:44 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-07-23 00:46:44 +0200 |
| commit | 74f85551666fe40bd739e95b5ecb20f53f8ad4df (patch) | |
| tree | aae026c719e7d81d25b8bc0623db740ff92e88e5 /drivers/firmware/efi/efi-pstore.c | |
| parent | 2a55280a3675203496d302463b941834228b9875 (diff) | |
| parent | 769e0fe1171e95d90ea5a2d6d0b2bdc7d5d2e7b2 (diff) | |
Merge tag 'efi-urgent-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgentefi-urgent-2020-07-25
Pull EFI fixes from Ard Biesheuvel:
- Fix the layering violation in the use of the EFI runtime services
availability mask in users of the 'efivars' abstraction
- Revert build fix for GCC v4.8 which is no longer supported
- Some fixes for build issues found by Atish while working on RISC-V support
- Avoid --whole-archive when linking the stub on arm64
- Some x86 EFI stub cleanups from Arvind
Diffstat (limited to 'drivers/firmware/efi/efi-pstore.c')
| -rw-r--r-- | drivers/firmware/efi/efi-pstore.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c index c2f1d4e6630b..feb7fe6f2da7 100644 --- a/drivers/firmware/efi/efi-pstore.c +++ b/drivers/firmware/efi/efi-pstore.c @@ -356,10 +356,7 @@ static struct pstore_info efi_pstore_info = { static __init int efivars_pstore_init(void) { - if (!efi_rt_services_supported(EFI_RT_SUPPORTED_VARIABLE_SERVICES)) - return 0; - - if (!efivars_kobject()) + if (!efivars_kobject() || !efivar_supports_writes()) return 0; if (efivars_pstore_disable) |