aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Thorlton <[email protected]>2013-07-08 16:00:42 -0700
committerLinus Torvalds <[email protected]>2013-07-09 10:33:25 -0700
commitdcb6b45254e2281b6f99ea7f2d51343954aa3ba8 (patch)
treeb7a6b377496550a7fe6acb9a37ab2bc8d0f8bc7d
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. [[email protected]: remove stray quote] Signed-off-by: Alex Thorlton <[email protected]> Reviewed-by: Robin Holt <[email protected]> Cc: Stephen Boyd <[email protected]> Cc: Vikram Mulukutla <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-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 {
static void warn_slowpath_common(const char *file, int line, void *caller,
unsigned taint, struct slowpath_args *args)
{
- 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);