mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-23 13:09:04 -04:00
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
This commit is contained in:
commit
6ed23fd6c0
5 changed files with 20 additions and 45 deletions
|
|
@ -22,6 +22,9 @@
|
|||
#ifndef _LINUX_PSTORE_H
|
||||
#define _LINUX_PSTORE_H
|
||||
|
||||
#include <linux/time.h>
|
||||
#include <linux/kmsg_dump.h>
|
||||
|
||||
/* types */
|
||||
enum pstore_type_id {
|
||||
PSTORE_TYPE_DMESG = 0,
|
||||
|
|
@ -41,7 +44,8 @@ struct pstore_info {
|
|||
ssize_t (*read)(u64 *id, enum pstore_type_id *type,
|
||||
struct timespec *time, char **buf,
|
||||
struct pstore_info *psi);
|
||||
int (*write)(enum pstore_type_id type, u64 *id,
|
||||
int (*write)(enum pstore_type_id type,
|
||||
enum kmsg_dump_reason reason, u64 *id,
|
||||
unsigned int part, size_t size, struct pstore_info *psi);
|
||||
int (*erase)(enum pstore_type_id type, u64 id,
|
||||
struct pstore_info *psi);
|
||||
|
|
@ -50,18 +54,12 @@ struct pstore_info {
|
|||
|
||||
#ifdef CONFIG_PSTORE
|
||||
extern int pstore_register(struct pstore_info *);
|
||||
extern int pstore_write(enum pstore_type_id type, char *buf, size_t size);
|
||||
#else
|
||||
static inline int
|
||||
pstore_register(struct pstore_info *psi)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
static inline int
|
||||
pstore_write(enum pstore_type_id type, char *buf, size_t size)
|
||||
{
|
||||
return -ENODEV;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /*_LINUX_PSTORE_H*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue