On Sat, 13 Dec 2008, Cyrill Gorcunov wrote:

> [Steven Rostedt - Fri, Dec 12, 2008 at 04:22:49PM -0500]
> ...
> | > Index: linux-2.6.git/arch/x86/include/asm/ftrace.h
> | > ===================================================================
> | > --- linux-2.6.git.orig/arch/x86/include/asm/ftrace.h
> | > +++ linux-2.6.git/arch/x86/include/asm/ftrace.h
> | > @@ -1,6 +1,33 @@
> | >  #ifndef _ASM_X86_FTRACE_H
> | >  #define _ASM_X86_FTRACE_H
> | > 
> | > +#ifdef __ASSEMBLY__
> | 
> | Why add assembly condition? We only want this if CONFIG_FUNCTION_TRACER 
> | is enabled, right?  We could combine it with the current #ifndef inside 
> | the CONFIG_FUNCTION_TRACER. But I would make do:
> | 
> | #ifdef __ASSEMBLY__
> | <your stuff>
> | #else
> | < C stuff >
> | #endif
> | 
> | -- Steve
> 
> Steve, here is how it could look like:
> (I liked first proposal more :)

I see the confusion. In ftrace.h the function graph tracer config is not 
inside CONFIG_FUNCTION_TRACER, even though it is dependent on it (or 
was). OK, just do your first proposal then.

-- Steve