diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 09:38:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 09:38:18 -0800 |
| commit | 024e4ec1856d57bb78c06ec903d29dcf716f5f47 (patch) | |
| tree | 72c89ea735f2aad2f63f64444ec056d7da8e06ff /include | |
| parent | 850cb82b754c931c570c9cb7f10c9f2181bac617 (diff) | |
| parent | fb0af3f2b1b613e5ea75426d454c7e5b1d1eef49 (diff) | |
| download | linux-3.10-024e4ec1856d57bb78c06ec903d29dcf716f5f47.tar.gz linux-3.10-024e4ec1856d57bb78c06ec903d29dcf716f5f47.tar.bz2 linux-3.10-024e4ec1856d57bb78c06ec903d29dcf716f5f47.zip | |
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull pstore patches from Tony Luck:
"A few fixes to reduce places where pstore might hang a system in the
crash path. Plus a new mountpoint (/sys/fs/pstore ... makes more
sense then /dev/pstore)."
Fix up trivial conflict in drivers/firmware/efivars.c
* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: Create a convenient mount point for pstore
efi_pstore: Introducing workqueue updating sysfs
efivars: Disable external interrupt while holding efivars->lock
efi_pstore: Avoid deadlock in non-blocking paths
pstore: Avoid deadlock in panic and emergency-restart path
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 3 | ||||
| -rw-r--r-- | include/linux/pstore.h | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 7a9498ab3c2..9bf2f1fcae2 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -740,7 +740,8 @@ struct efivars { * 1) ->list - adds, removals, reads, writes * 2) ops.[gs]et_variable() calls. * It must not be held when creating sysfs entries or calling kmalloc. - * ops.get_next_variable() is only called from register_efivars(), + * ops.get_next_variable() is only called from register_efivars() + * or efivar_update_sysfs_entries(), * which is protected by the BKL, so that path is safe. */ spinlock_t lock; diff --git a/include/linux/pstore.h b/include/linux/pstore.h index 1788909d9a9..75d01760c91 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -68,12 +68,18 @@ struct pstore_info { #ifdef CONFIG_PSTORE extern int pstore_register(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*/ |