diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:03:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 18:03:02 -0800 |
| commit | 6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd (patch) | |
| tree | 5cb5bb5dbefbb6458eff4bdae3c091ca3c02d685 /drivers | |
| parent | 5ee354a0295c34aa7da07be8490f86edee2c7883 (diff) | |
| parent | 2174f6df7891fa331800beb72634c969f017900b (diff) | |
Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: gracefully handle NULL pstore_info functions
pstore: pass reason to backend write callback
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/apei/erst.c | 6 | ||||
| -rw-r--r-- | drivers/firmware/efivars.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index 631b9477b99..6a9e3bad13f 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c @@ -934,7 +934,8 @@ static int erst_close_pstore(struct pstore_info *psi); static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, struct timespec *time, char **buf, struct pstore_info *psi); -static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part, +static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason, + u64 *id, unsigned int part, size_t size, struct pstore_info *psi); static int erst_clearer(enum pstore_type_id type, u64 id, struct pstore_info *psi); @@ -1053,7 +1054,8 @@ out: return (rc < 0) ? rc : (len - sizeof(*rcd)); } -static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part, +static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason, + u64 *id, unsigned int part, size_t size, struct pstore_info *psi) { struct cper_pstore_record *rcd = (struct cper_pstore_record *) diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index b0a81173a26..d25599f2a3f 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -495,7 +495,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type, return 0; } -static int efi_pstore_write(enum pstore_type_id type, u64 *id, +static int efi_pstore_write(enum pstore_type_id type, + enum kmsg_dump_reason reason, u64 *id, unsigned int part, size_t size, struct pstore_info *psi) { char name[DUMP_NAME_LEN]; @@ -565,7 +566,7 @@ static int efi_pstore_write(enum pstore_type_id type, u64 *id, static int efi_pstore_erase(enum pstore_type_id type, u64 id, struct pstore_info *psi) { - efi_pstore_write(type, &id, (unsigned int)id, 0, psi); + efi_pstore_write(type, 0, &id, (unsigned int)id, 0, psi); return 0; } @@ -587,7 +588,8 @@ static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type, return -1; } -static int efi_pstore_write(enum pstore_type_id type, u64 *id, +static int efi_pstore_write(enum pstore_type_id type, + enum kmsg_dump_reason reason, u64 *id, unsigned int part, size_t size, struct pstore_info *psi) { return 0; |