diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 11:51:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-05 11:51:18 -0800 |
| commit | 66339fdacb63fc7908e7eb755b9fffa672ffbb10 (patch) | |
| tree | ea88da0958e59ea4d9ff1ac097498afdd01d5cc6 /include | |
| parent | 0fcb9d21b4e18ede3727b8905e74acd0d1daef56 (diff) | |
| parent | 306e5c2a3cb45a0256ae6677501d1144e93efa2f (diff) | |
| download | linux-66339fdacb63fc7908e7eb755b9fffa672ffbb10.tar.bz2 | |
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull pstore updates from Tony Luck:
"Half dozen small cleanups plus change to allow pstore backend drivers
to be unloaded"
* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: fix code comment to match code
efi-pstore: fix kernel-doc argument name
pstore: Fix return type of pstore_is_mounted()
pstore: add pstore unregister
pstore: add a helper function pstore_register_kmsg
pstore: add vmalloc error check
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pstore.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index 8e7a25b068b0..831479f8df8f 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -75,20 +75,8 @@ struct pstore_info { #define PSTORE_FLAGS_FRAGILE 1 -#ifdef CONFIG_PSTORE extern int pstore_register(struct pstore_info *); +extern void pstore_unregister(struct pstore_info *); extern bool pstore_cannot_block_path(enum kmsg_dump_reason reason); -#else -static inline int -pstore_register(struct pstore_info *psi) -{ - return -ENODEV; -} -static inline bool -pstore_cannot_block_path(enum kmsg_dump_reason reason) -{ - return false; -} -#endif #endif /*_LINUX_PSTORE_H*/ |