Re: linux-next: tracing/powerpc tree build failure

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 2938 bytes --]

Hi all,

This patch is now applicable to the tracing tree after merging with
Linus' tree.

On Fri, 27 Mar 2009 08:48:51 -0400 Steven Rostedt <srostedt@redhat.com> wrote:
>
> 
> On Fri, 2009-03-27 at 23:08 +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next build (powerpc allyesconfig) failed like this:
> > 
> > arch/powerpc/kernel/ftrace.c: In function 'prepare_ftrace_return':
> > arch/powerpc/kernel/ftrace.c:612: warning: passing argument 3 of 'ftrace_push_return_trace' makes pointer from integer without a cast
> > arch/powerpc/kernel/ftrace.c:612: error: too many arguments to function 'ftrace_push_return_trace'
> > 
> > Caused by commit 5d1a03dc541dc6672e60e57249ed22f40654ca47
> > ("function-graph: moved the timestamp from arch to generic code") from
> > the tracing tree which (removed an argument from
> > ftrace_push_return_trace()) interacting with commit
> > 6794c78243bfda020ab184d6d578944f8e90d26c ("powerpc64: port of the
> > function graph tracer") from the powerpc tree.
> > 
> > I added the following patch and can carry it as necessary.
> 
> Thanks Stephen!!!
> 
> I knew this was going to break, but I needed to wait till powerpc merged
> with tip before I could make the change.
> 
> > -- 
> > Cheers,
> > Stephen Rothwell                    sfr@canb.auug.org.au
> > http://www.canb.auug.org.au/~sfr/
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 27 Mar 2009 22:47:58 +1100
> > Subject: [PATCH] tracing: fixup for ftrace_push_return_trace API change
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  arch/powerpc/kernel/ftrace.c |    6 +-----
> >  1 files changed, 1 insertions(+), 5 deletions(-)
> > 
> > diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
> > index 5b5d16b..5455943 100644
> > --- a/arch/powerpc/kernel/ftrace.c
> > +++ b/arch/powerpc/kernel/ftrace.c
> > @@ -557,7 +557,6 @@ extern void mod_return_to_handler(void);
> >  void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
> >  {
> >  	unsigned long old;
> > -	unsigned long long calltime;
> >  	int faulted;
> >  	struct ftrace_graph_ent trace;
> >  	unsigned long return_hooker = (unsigned long)&return_to_handler;
> > @@ -606,10 +605,7 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
> >  		return;
> >  	}
> >  
> > -	calltime = cpu_clock(raw_smp_processor_id());
> > -
> > -	if (ftrace_push_return_trace(old, calltime,
> > -				self_addr, &trace.depth) == -EBUSY) {
> > +	if (ftrace_push_return_trace(old, self_addr, &trace.depth) == -EBUSY) {
> 
> This is exactly what I would have done.
> 
> Acked-by: Steven Rostedt <srostedt@redhat.com>
> 
> -- Steve
> 
> >  		*parent = old;
> >  		return;
> >  	}
> 


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]