Merge branch 'next' into for-linus

[android-x86/kernel.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 3e162d8..4067412 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1461,6 +1461,7 @@ EXPORT_SYMBOL_GPL(kmsg_dump_unregister);
 static const char const *kmsg_reasons[] = {
        [KMSG_DUMP_OOPS]        = "oops",
        [KMSG_DUMP_PANIC]       = "panic",
+       [KMSG_DUMP_KEXEC]       = "kexec",
 };
 
 static const char *kmsg_to_str(enum kmsg_dump_reason reason)