diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:39:00 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:39:00 +0400 |
| commit | 8e7bfcbab3825d1b404d615cb1b54f44ff81f981 (patch) | |
| tree | 5465eeb9c58af8dd8a26466c61de69b4b1df89dc /include/linux | |
| parent | 102dc1bae12a20214c9ee2d33a7402dc5175e30d (diff) | |
| parent | 30f7276cb35a22743d709a460ae3639aad50366a (diff) | |
| download | linux-8e7bfcbab3825d1b404d615cb1b54f44ff81f981.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] define "_sdata" symbol
pstore: Fix Kconfig dependencies for apei->pstore
pstore: fix potential logic issue in pstore read interface
pstore: fix pstore filesystem mount/remount issue
pstore: fix one type of return value in pstore
[IA64] fix build warning in arch/ia64/oprofile/backtrace.c
Diffstat (limited to 'include/linux')
| -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 41977737bb7d..2455ef2683f0 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -35,7 +35,9 @@ struct pstore_info { struct mutex buf_mutex; /* serialize access to 'buf' */ char *buf; size_t bufsize; - size_t (*read)(u64 *id, enum pstore_type_id *type, + 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); u64 (*write)(enum pstore_type_id type, size_t size); int (*erase)(u64 id); |