From: Ingo Molnar <mingo@elte.hu>
To: Steven Rostedt <rostedt@goodmis.org>,
Vegard Nossum <vegard.nossum@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: [PATCH 0/5] [GIT PULL] tracing/filters/ringbuffer: updates for 2.6.31
Date: Tue, 16 Jun 2009 21:58:51 +0200 [thread overview]
Message-ID: <20090616195851.GA6802@elte.hu> (raw)
In-Reply-To: <alpine.DEB.2.00.0906161548110.26673@gandalf.stny.rr.com>
* Steven Rostedt <rostedt@goodmis.org> wrote:
> On Tue, 16 Jun 2009, Ingo Molnar wrote:
>
> >
> > hm, there's a new build failure with this lot:
> >
> > kernel/trace/ring_buffer.c:1298: error: ?event? undeclared (first use in this function)
> > kernel/trace/ring_buffer.c:1298: error: (Each undeclared identifier is reported only once
> > kernel/trace/ring_buffer.c:1298: error: for each function it appears in.)
>
> Strange, I have a blank line at line 1298:
>
> 1294 cpu_buffer->tail_page->page->time_stamp = *ts;
> 1295 }
> 1296
> 1297 rb_reset_tail(cpu_buffer, tail_page, tail, length);
> 1298
> 1299 __raw_spin_unlock(&cpu_buffer->lock);
> 1300 local_irq_restore(flags);
> 1301
ah. git auto-merge getting confused:
}
kmemcheck_annotate_bitfield(event, bitfield);
rb_reset_tail(cpu_buffer, tail_page, tail, length);
it's rare that we see something like that.
Ingo
prev parent reply other threads:[~2009-06-16 19:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-16 17:51 [PATCH 0/5] [GIT PULL] tracing/filters/ringbuffer: updates for 2.6.31 Steven Rostedt
2009-06-16 17:51 ` [PATCH 1/5] ring-buffer: have benchmark test handle discarded events Steven Rostedt
2009-06-16 17:51 ` [PATCH 2/5] ring-buffer: remove unused variable Steven Rostedt
2009-06-16 17:51 ` [PATCH 3/5] ring-buffer: use commit counters for commit pointer accounting Steven Rostedt
2009-06-16 17:51 ` [PATCH 4/5] tracing/filters: free filter_string in destroy_preds() Steven Rostedt
2009-06-16 17:51 ` [PATCH 5/5] tracing/filters: fix race between filter setting and module unload Steven Rostedt
2009-06-16 19:28 ` [PATCH 0/5] [GIT PULL] tracing/filters/ringbuffer: updates for 2.6.31 Ingo Molnar
2009-06-16 19:36 ` Ingo Molnar
2009-06-16 19:48 ` Steven Rostedt
2009-06-16 19:58 ` Ingo Molnar [this message]
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=20090616195851.GA6802@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=vegard.nossum@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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