From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jason Wessel <jason.wessel@windriver•com>,
Lai Jiangshan <laijs@cn•fujitsu.com>,
Steven Rostedt <rostedt@goodmis•org>
Subject: linux-next: manual merge of the tip tree with the kgdb tree
Date: Thu, 14 Jan 2010 16:13:02 +1100 [thread overview]
Message-ID: <20100114161302.285ebe27.sfr@canb.auug.org.au> (raw)
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@canb•auug.org.au
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;
next reply other threads:[~2010-01-14 5:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-14 5:13 Stephen Rothwell [this message]
2010-01-14 9:26 ` linux-next: manual merge of the tip tree with the kgdb tree Ingo Molnar
2010-01-14 15:01 ` Jason Wessel
2010-01-14 15:20 ` Steven Rostedt
2010-01-14 15:49 ` Jason Wessel
-- strict thread matches above, loose matches on Subject: below --
2010-05-14 4:14 Stephen Rothwell
2010-05-14 14:00 ` Don Zickus
2010-02-01 6:29 Stephen Rothwell
2010-02-01 15:46 ` Jason Wessel
2010-02-01 23:25 ` Stephen Rothwell
2009-10-28 7:04 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100114161302.285ebe27.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=jason.wessel@windriver$(echo .)com \
--cc=laijs@cn$(echo .)fujitsu.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox