2 files changed, 8 insertions, 1 deletions

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 7a9498ab3c2d..9bf2f1fcae27 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 1788909d9a99..75d01760c911 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*/