linux-next: manual merge of the tip tree with the kgdb tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
kernel/trace/trace.c between commit
d304af88a0105ff5b64cffc9108636ecad1fdd78 ("ftrace,kdb: Extend kdb to be
able to dump the ftrace buffer") from the kgdb tree and commit
7e53bd42d14c75192b99674c40fcc359392da59d ("tracing: Consolidate
protection of reader access to the ring buffer") from the tip tree.

Just context changes (I think).  I fixed it up (see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc kernel/trace/trace.c
index b3c786a,5314c90..0000000
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -100,11 -101,11 +101,8 @@@ static inline void ftrace_enable_cpu(vo
  	preempt_enable();
  }
  
 -static cpumask_var_t __read_mostly	tracing_buffer_mask;
 -
 -#define for_each_tracing_cpu(cpu)	\
 -	for_each_cpu(cpu, tracing_buffer_mask)
 +cpumask_var_t __read_mostly	tracing_buffer_mask;
  
- /* Define which cpu buffers are currently read in trace_pipe */
- static cpumask_var_t			tracing_reader_cpumask;
- 
  /*
   * ftrace_dump_on_oops - variable to dump ftrace buffer on oops
   *
@@@ -3066,7 -3131,8 +3123,8 @@@ waitagain
  	iter->pos = -1;
  
  	trace_event_read_lock();
+ 	trace_access_lock(iter->cpu_file);
 -	while (find_next_entry_inc(iter) != NULL) {
 +	while (trace_find_next_entry_inc(iter) != NULL) {
  		enum print_line_t ret;
  		int len = iter->seq.len;
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/