Merge tag 'trace-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[cascardo/linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 9771231..8018646 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -15,6 +15,7 @@
 #include <linux/notifier.h>
 #include <linux/module.h>
 #include <linux/random.h>
+#include <linux/ftrace.h>
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/kexec.h>
@@ -399,6 +400,8 @@ struct slowpath_args {
 static void warn_slowpath_common(const char *file, int line, void *caller,
                                 unsigned taint, struct slowpath_args *args)
 {
+       disable_trace_on_warning();
+
        pr_warn("------------[ cut here ]------------\n");
        pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
                raw_smp_processor_id(), current->pid, file, line, caller);