diff options
| author | Linus Torvalds | 2015-02-11 17:36:52 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2015-02-11 17:36:52 -0800 |
| commit | 07f80d41cf24b7e6e76cd97d420167932c9a7f82 (patch) | |
| tree | 86ee28ad0e085d96a94986c1efdada11d5457139 /include | |
| parent | 6f83e5bd3e96228ee0caff0b103addb5f4e95459 (diff) | |
| parent | a6b8978c54b771308f6f1692b9735ac0bb087cc2 (diff) | |
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull pstore update from Tony Luck:
"Miscellaneous fs/pstore fixes"
* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: Fix sprintf format specifier in pstore_dump()
pstore: Add pmsg - user-space accessible pstore object
pstore: Handle zero-sized prz in series
pstore: Remove superfluous memory size check
pstore: Use scnprintf() in pstore_mkfile()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pstore.h | 1 | ||||
| -rw-r--r-- | include/linux/pstore_ram.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index ece0c6bbfcc5..8884f6e507f7 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -39,6 +39,7 @@ enum pstore_type_id { PSTORE_TYPE_PPC_RTAS = 4, PSTORE_TYPE_PPC_OF = 5, PSTORE_TYPE_PPC_COMMON = 6, + PSTORE_TYPE_PMSG = 7, PSTORE_TYPE_UNKNOWN = 255 }; diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h index 4af3fdc85b01..9c9d6c154c8e 100644 --- a/include/linux/pstore_ram.h +++ b/include/linux/pstore_ram.h @@ -81,6 +81,7 @@ struct ramoops_platform_data { unsigned long record_size; unsigned long console_size; unsigned long ftrace_size; + unsigned long pmsg_size; int dump_oops; struct persistent_ram_ecc_info ecc_info; }; |