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 4cea6cc..8018646 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -402,8 +402,9 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
 {
        disable_trace_on_warning();
 
-       printk(KERN_WARNING "------------[ cut here ]------------\n");
-       printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
+       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);
 
        if (args)
                vprintk(args->fmt, args->args);