mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
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
This commit is contained in:
commit
8e7bfcbab3
6 changed files with 60 additions and 21 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue