kmsg_dump: don't run on non-error paths by default

[linux-flexiantxendom0.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 7982a0a..3524a2d 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -701,6 +701,9 @@ static int printk_time = 0;
 #endif
 module_param_named(time, printk_time, bool, S_IRUGO | S_IWUSR);
 
+static bool always_kmsg_dump;
+module_param_named(always_kmsg_dump, always_kmsg_dump, bool, S_IRUGO | S_IWUSR);
+
 /* Check if we have any console registered that can be called early in boot. */
 static int have_callable_console(void)
 {
@@ -1733,6 +1736,9 @@ void kmsg_dump(enum kmsg_dump_reason reason)
        unsigned long l1, l2;
        unsigned long flags;
 
+       if ((reason > KMSG_DUMP_OOPS) && !always_kmsg_dump)
+               return;
+
        /* Theoretically, the log could move on after we do this, but
           there's not a lot we can do about that. The new messages
           will overwrite the start of what we dump. */