lkml.org 
[lkml]   [2013]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the ftrace tree
Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
kernel/panic.c between commit de7edd31457b ("tracing: Disable tracing on
warning") from the ftrace tree and commit "panic: add cpu/pid to
warn_slowpath_common in WARNING printk()s" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc kernel/panic.c
index 4cea6cc,aaa0b7c..0000000
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@@ -400,10 -399,9 +400,11 @@@ 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();
+
- 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);
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-06-21 10:21    [W:0.022 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site