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

Merge branch 'efi/next' into efi/urgent

parents c3f38fa6 7c23b186

drivers/firmware/efi/efi-pstore.c

+4 −4
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int efi_pstore_read_func(struct pstore_record *record, 
				     &size, record->buf);

	if (status != EFI_SUCCESS) {

		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) 
			return 0;



		if (status != EFI_SUCCESS)

			return -EIO;

			return efi_status_to_err(status);



		/* skip variables that don't concern us */

		if (efi_guidcmp(guid, LINUX_EFI_CRASH_GUID))
@@ -227,7 +227,7 @@ static int efi_pstore_write(struct pstore_record *record) 
					    record->size, record->psi->buf,

					    true);

	efivar_unlock();

	return status == EFI_SUCCESS ? 0 : -EIO;

	return efi_status_to_err(status);

};



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);



	if (status != EFI_SUCCESS && status != EFI_NOT_FOUND)

		return -EIO;

		return efi_status_to_err(status);

	return 0;

}

drivers/firmware/efi/libstub/zboot.lds

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ SECTIONS 
	}



	/DISCARD/ : {

		*(.discard .discard.*)

		*(.modinfo .init.modinfo)

	}

}