pstore: Convert buf_lock to semaphore

[mirror_ubuntu-bionic-kernel.git] / drivers / firmware / efi / efi-pstore.c

diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
index 5a0fa939d70f961a998317cb88c8ee4705e1065f..4277147f7140064f3e6d3dc22d24705fa769e061 100644 (file)
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -258,8 +258,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();
@@ -368,7 +367,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);