aboutsummaryrefslogtreecommitdiff
path: root/fs/pstore/internal.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-20 14:27:48 +0900
committerMark Brown <broonie@kernel.org>2015-02-20 14:27:48 +0900
commit855267e97aab7a25fb3aaa27f8080a0792fb3011 (patch)
tree5409f76605c8227e46070295f2bf97d87f2dcc9e /fs/pstore/internal.h
parentd88f67b8441516e42e59a064546ac3a78a992d82 (diff)
parentecfe0b5f15b23de6fea4ed4d0bc9ef27c382c0cb (diff)
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into lsk-v3.10-aospv3.10/topic/aosp
Diffstat (limited to 'fs/pstore/internal.h')
-rw-r--r--fs/pstore/internal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h
index 937d820f273c..fd8d248c285c 100644
--- a/fs/pstore/internal.h
+++ b/fs/pstore/internal.h
@@ -45,6 +45,12 @@ extern void pstore_register_ftrace(void);
static inline void pstore_register_ftrace(void) {}
#endif
+#ifdef CONFIG_PSTORE_PMSG
+extern void pstore_register_pmsg(void);
+#else
+static inline void pstore_register_pmsg(void) {}
+#endif
+
extern struct pstore_info *psinfo;
extern void pstore_set_kmsg_bytes(int);