linux-kernel - linux-next: manual merge of the ftrace tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130710135129.f4e0966747fc684a7294544f@canb.auug.org.au>
Date:	Wed, 10 Jul 2013 13:51:29 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alex Thorlton <athorlton@....com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: linux-next: manual merge of the ftrace tree with Linus' tree

Hi Steven,

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

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

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

diff --cc kernel/panic.c
index 9771231,4cea6cc..0000000
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@@ -399,9 -400,10 +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);

Content of type "application/pgp-signature" skipped