diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-06-14 16:26:50 -0400 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-06-14 16:26:50 -0400 |
commit | ca699d88fdbba0b809f564d198323ab03d5b4fd5 (patch) | |
tree | 8647bfcef73254a4ff84e708534e89f550b0f73f /drivers/firmware/efi | |
parent | 5b4910e057b97b241219a42bc32bc1caa605f05a (diff) | |
parent | 768292d053619b2725b846ed2bf556bf40f43de2 (diff) |
Merge tag 'v4.19.50' into v4.19-rt
This is the 4.19.50 stable release
Diffstat (limited to 'drivers/firmware/efi')
-rw-r--r-- | drivers/firmware/efi/efi-pstore.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c index cfe87b465819..0f7d97917197 100644 --- a/drivers/firmware/efi/efi-pstore.c +++ b/drivers/firmware/efi/efi-pstore.c @@ -259,8 +259,7 @@ static int efi_pstore_write(struct pstore_record *record) efi_name[i] = name[i]; ret = efivar_entry_set_safe(efi_name, vendor, PSTORE_EFI_ATTRIBUTES, - !pstore_cannot_block_path(record->reason), - record->size, record->psi->buf); + preemptible(), record->size, record->psi->buf); if (record->reason == KMSG_DUMP_OOPS) efivar_run_worker(); @@ -369,7 +368,6 @@ static __init int efivars_pstore_init(void) return -ENOMEM; efi_pstore_info.bufsize = 1024; - spin_lock_init(&efi_pstore_info.buf_lock); if (pstore_register(&efi_pstore_info)) { kfree(efi_pstore_info.buf); |