Commit 290be0a4 authored by Ard Biesheuvel's avatar Ard Biesheuvel

Merge branch 'efi/next' into efi/urgent

parents c3f38fa6 7c23b186
...@@ -136,7 +136,7 @@ static int efi_pstore_read_func(struct pstore_record *record, ...@@ -136,7 +136,7 @@ static int efi_pstore_read_func(struct pstore_record *record,
&size, record->buf); &size, record->buf);
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
kfree(record->buf); kfree(record->buf);
return -EIO; return efi_status_to_err(status);
} }
/* /*
...@@ -189,7 +189,7 @@ static ssize_t efi_pstore_read(struct pstore_record *record) ...@@ -189,7 +189,7 @@ static ssize_t efi_pstore_read(struct pstore_record *record)
return 0; return 0;
if (status != EFI_SUCCESS) if (status != EFI_SUCCESS)
return -EIO; return efi_status_to_err(status);
/* skip variables that don't concern us */ /* skip variables that don't concern us */
if (efi_guidcmp(guid, LINUX_EFI_CRASH_GUID)) if (efi_guidcmp(guid, LINUX_EFI_CRASH_GUID))
...@@ -227,7 +227,7 @@ static int efi_pstore_write(struct pstore_record *record) ...@@ -227,7 +227,7 @@ static int efi_pstore_write(struct pstore_record *record)
record->size, record->psi->buf, record->size, record->psi->buf,
true); true);
efivar_unlock(); efivar_unlock();
return status == EFI_SUCCESS ? 0 : -EIO; return efi_status_to_err(status);
}; };
static int efi_pstore_erase(struct pstore_record *record) static int efi_pstore_erase(struct pstore_record *record)
...@@ -238,7 +238,7 @@ static int efi_pstore_erase(struct pstore_record *record) ...@@ -238,7 +238,7 @@ static int efi_pstore_erase(struct pstore_record *record)
PSTORE_EFI_ATTRIBUTES, 0, NULL); PSTORE_EFI_ATTRIBUTES, 0, NULL);
if (status != EFI_SUCCESS && status != EFI_NOT_FOUND) if (status != EFI_SUCCESS && status != EFI_NOT_FOUND)
return -EIO; return efi_status_to_err(status);
return 0; return 0;
} }
......
...@@ -41,6 +41,7 @@ SECTIONS ...@@ -41,6 +41,7 @@ SECTIONS
} }
/DISCARD/ : { /DISCARD/ : {
*(.discard .discard.*)
*(.modinfo .init.modinfo) *(.modinfo .init.modinfo)
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment