aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAlex Thorlton <athorlton@sgi.com>2013-07-08 19:00:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-09 13:33:25 -0400
commitdcb6b45254e2281b6f99ea7f2d51343954aa3ba8 (patch)
treeb7a6b377496550a7fe6acb9a37ab2bc8d0f8bc7d /kernel
parent0a1be15097a5f5ee8cbaf7cf0a55146363db0e4d (diff)
panic: add cpu/pid to warn_slowpath_common in WARNING printk()s
Add the cpu/pid that called WARN() so that the stack traces can be matched up with the WARNING messages. [akpm@linux-foundation.org: remove stray quote] Signed-off-by: Alex Thorlton <athorlton@sgi.com> Reviewed-by: Robin Holt <holt@sgi.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Vikram Mulukutla <markivx@codeaurora.org> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Tejun Heo <tj@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 167ec097ce8b..97712319f128 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -399,8 +399,9 @@ struct slowpath_args {
399static void warn_slowpath_common(const char *file, int line, void *caller, 399static void warn_slowpath_common(const char *file, int line, void *caller,
400 unsigned taint, struct slowpath_args *args) 400 unsigned taint, struct slowpath_args *args)
401{ 401{
402 printk(KERN_WARNING "------------[ cut here ]------------\n"); 402 pr_warn("------------[ cut here ]------------\n");
403 printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller); 403 pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
404 raw_smp_processor_id(), current->pid, file, line, caller);
404 405
405 if (args) 406 if (args)
406 vprintk(args->fmt, args->args); 407 vprintk(args->fmt, args->args);