Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux-2.6-microblaze.git] / fs / pstore / platform.c

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index e8690d8..a9e297e 100644 (file)
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -77,12 +77,17 @@ static DEFINE_MUTEX(psinfo_lock);
 struct pstore_info *psinfo;
 
 static char *backend;
+module_param(backend, charp, 0444);
+MODULE_PARM_DESC(backend, "specific backend to use");
+
 static char *compress =
 #ifdef CONFIG_PSTORE_COMPRESS_DEFAULT
                CONFIG_PSTORE_COMPRESS_DEFAULT;
 #else
                NULL;
 #endif
+module_param(compress, charp, 0444);
+MODULE_PARM_DESC(compress, "compression to use");
 
 /* Compression parameters */
 static struct crypto_comp *tfm;
@@ -130,26 +135,6 @@ enum pstore_type_id pstore_name_to_type(const char *name)
 }
 EXPORT_SYMBOL_GPL(pstore_name_to_type);
 
-static const char *get_reason_str(enum kmsg_dump_reason reason)
-{
-       switch (reason) {
-       case KMSG_DUMP_PANIC:
-               return "Panic";
-       case KMSG_DUMP_OOPS:
-               return "Oops";
-       case KMSG_DUMP_EMERG:
-               return "Emergency";
-       case KMSG_DUMP_RESTART:
-               return "Restart";
-       case KMSG_DUMP_HALT:
-               return "Halt";
-       case KMSG_DUMP_POWEROFF:
-               return "Poweroff";
-       default:
-               return "Unknown";
-       }
-}
-
 static void pstore_timer_kick(void)
 {
        if (pstore_update_ms < 0)
@@ -402,7 +387,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,
        unsigned int    part = 1;
        int             ret;
 
-       why = get_reason_str(reason);
+       why = kmsg_dump_reason_str(reason);
 
        if (down_trylock(&psinfo->buf_lock)) {
                /* Failed to acquire lock: give up if we cannot wait. */
@@ -610,8 +595,10 @@ int pstore_register(struct pstore_info *psi)
 
        pstore_get_records(0);
 
-       if (psi->flags & PSTORE_FLAGS_DMESG)
+       if (psi->flags & PSTORE_FLAGS_DMESG) {
+               pstore_dumper.max_reason = psinfo->max_reason;
                pstore_register_kmsg();
+       }
        if (psi->flags & PSTORE_FLAGS_CONSOLE)
                pstore_register_console();
        if (psi->flags & PSTORE_FLAGS_FTRACE)
@@ -853,11 +840,5 @@ static void __exit pstore_exit(void)
 }
 module_exit(pstore_exit)
 
-module_param(compress, charp, 0444);
-MODULE_PARM_DESC(compress, "Pstore compression to use");
-
-module_param(backend, charp, 0444);
-MODULE_PARM_DESC(backend, "Pstore backend to use");
-
 MODULE_AUTHOR("Tony Luck <tony.luck@intel.com>");
 MODULE_LICENSE("GPL");