lkml.org 
[lkml]   [2009]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 0/5] [GIT PULL] tracing/filters/ringbuffer: updates for 2.6.31

    * 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


    \
     
     \ /
      Last update: 2009-06-16 22:01    [W:0.047 / U:0.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site