Messages in this thread | | | Subject | Re: [PATCH][GIT PULL][v3.4] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again) | From | Steven Rostedt <> | Date | Thu, 12 Apr 2012 16:39:53 -0400 |
| |
On Thu, 2012-04-12 at 16:25 -0400, Steven Rostedt wrote: > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h > index 95059f0..ff639ca 100644 > --- a/kernel/trace/trace.h > +++ b/kernel/trace/trace.h > @@ -836,11 +836,15 @@ extern const char *__stop___trace_bprintk_fmt[]; > filter) > #include "trace_entries.h" >
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?
Thanks,
-- Steve
> +#ifdef CONFIG_PERF_EVENTS > #ifdef 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 /* CONFIG_FUNCTION_TRACER */ > +#else > +#define perf_ftrace_event_register NULL > +#endif /* CONFIG_PERF_EVENTS */ > > #endif /* _LINUX_KERNEL_TRACE_H */ >
| |