Re: [PATCH 0/2] [GIT PULL] tracing/events/ring-buffer: block trace points and fix

[Ingo Molnar <mingo@elte.hu>]

* Li Zefan <lizf@cn.fujitsu.com> wrote:

> Ingo Molnar wrote:
> > * Steven Rostedt <rostedt@goodmis.org> wrote:
> > 
> >> Ingo,
> >>
> >> Please pull the latest tip/tracing/ftrace tree, which can be found at:
> >>
> >>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> >> tip/tracing/ftrace
> >>
> >>
> >> Li Zefan (1):
> >>       tracing/events: convert block trace points to TRACE_EVENT()
> >>
> >> Steven Rostedt (1):
> >>       ring-buffer: fix ret in rb_add_time_stamp
> >>
> >> ----
> >>  block/blk-core.c             |   16 +-
> >>  block/elevator.c             |    8 +-
> >>  drivers/md/dm.c              |    5 +-
> >>  fs/bio.c                     |    3 +-
> >>  include/linux/blktrace_api.h |   13 ++
> >>  include/trace/block.h        |   76 -------
> >>  include/trace/events/block.h |  483 ++++++++++++++++++++++++++++++++++++++++++
> >>  kernel/trace/Makefile        |    5 +-
> >>  kernel/trace/blktrace.c      |   78 +++++++-
> >>  kernel/trace/ring_buffer.c   |    2 +-
> >>  mm/bounce.c                  |    5 +-
> >>  11 files changed, 589 insertions(+), 105 deletions(-)
> > 
> > I'm getting some build failures here:
> > 
> > In file included from mm/highmem.c:30:
> > include/linux/blktrace_api.h:223: warning: ‘struct request’ declared inside parameter list
> > include/linux/blktrace_api.h:223: warning: its scope is only this definition or declaration, which is probably not what you want
> > include/linux/blktrace_api.h: In function ‘blk_cmd_buf_len’:
> > include/linux/blktrace_api.h:225: error: implicit declaration of function ‘blk_pc_request’
> > include/linux/blktrace_api.h:225: error: dereferencing pointer to incomplete type
> > include/linux/blktrace_api.h: At top level:
> > include/linux/blktrace_api.h:228: warning: ‘struct request’ declared inside parameter list
> > include/linux/blktrace_api.h:230: warning: ‘struct request’ declared inside parameter list
> > distcc[15629] ERROR: compile mm/highmem.c on a/32 failed
> > 
> 
> I've fixed it. I'll post a new version after I've done some
> more building tests.

Please post a delta fix as Steve's already committed it.

	Ingo