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: <20130409163006.ed6b04b4a91d41b4633a4b4d@canb.auug.org.au>
Date:	Tue, 9 Apr 2013 16:30:06 +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
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/trace/trace.c between commit 2930e04d00e1 ("tracing: Fix race with
update_max_tr_single and changing tracers") from Linus' tree and commits
2b6080f28c7c ("tracing: Encapsulate global_trace and remove dependencies
on global vars") and 45ad21ca5530 ("tracing: Have trace_array keep track
if snapshot buffer is allocated") 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/trace/trace.c
index 7ba7fc7,829b2be..963491a
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -744,11 -904,8 +904,11 @@@ update_max_tr_single(struct trace_arra
  		return;

  	WARN_ON_ONCE(!irqs_disabled());
- 	if (!current_trace->allocated_snapshot) {
 -	if (WARN_ON_ONCE(!tr->allocated_snapshot))
++	if (!tr->allocated_snapshot) {
 +		/* Only the nop tracer should hit this when disabling */
- 		WARN_ON_ONCE(current_trace != &nop_trace);
++		WARN_ON_ONCE(tr->current_trace != &nop_trace);
  		return;
 +	}

  	arch_spin_lock(&ftrace_max_lock);

Content of type "application/pgp-signature" skipped