summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAlex Thorlton <athorlton@sgi.com>2013-06-07 10:08:38 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-06-17 18:17:54 +1000
commitee274df953ff4224a73d9d38921195e74022b4df (patch)
tree325293a0d51b623cdc9d8dde26219c58dac74345 /kernel
parent830e95375887ff9ce058802f5b18c7068285c04f (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. 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>
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..aaa0b7c7f51b 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);