On Thu, Apr 12, 2012 at 04:39:53PM -0400, Steven Rostedt wrote:

> Looking at this patch in more depth, it may be cleaner to do:

> #if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_FUNCTION_TRACER)
> int perf_ftrace_event_register(struct ftrace_event_call *call,
>   			       enum trace_reg type, void *data);
> #else
> # define perf_ftrace_event_register NULL
> #endif

> Mark, would you like to make the above update?

I've sent a revised version of the patch out.  I really don't care which
version gets merged or who writes the patch so long as we can get this
fixed.