diff options
| author | Linus Torvalds | 2011-11-28 11:27:57 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2011-11-28 11:27:57 -0800 |
| commit | cb3599926e3e7b3678583195effa61a03026ab0e (patch) | |
| tree | 775419d69e8732ba3f4933d3b7a07e98ae555458 /include | |
| parent | 4244cb482e8eab18142162a27c8829a04585863a (diff) | |
| parent | f6f8285132907757ef84ef8dae0a1244b8cde6ac (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: pass allocated memory region back to caller
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pstore.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index ea567321ae3c..2ca8cde5459d 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -35,10 +35,12 @@ struct pstore_info { spinlock_t buf_lock; /* serialize access to 'buf' */ char *buf; size_t bufsize; + struct mutex read_mutex; /* serialize open/read/close */ int (*open)(struct pstore_info *psi); int (*close)(struct pstore_info *psi); ssize_t (*read)(u64 *id, enum pstore_type_id *type, - struct timespec *time, struct pstore_info *psi); + struct timespec *time, char **buf, + struct pstore_info *psi); int (*write)(enum pstore_type_id type, u64 *id, unsigned int part, size_t size, struct pstore_info *psi); int (*erase)(enum pstore_type_id type, u64 id, |