diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-28 06:02:46 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-03-13 18:34:59 -0400 |
commit | fa73dc9400516945bcbae8d98c23393bcefe1440 (patch) | |
tree | f63deadc3b24a2534646dc7dff626fc7102fabe5 /kernel | |
parent | db6544e0075d192e5ad16eda8689c55fa9c6f8f4 (diff) |
tracing: Fix build breakage without CONFIG_PERF_EVENTS
Today's -next fails to build for me:
CC kernel/trace/trace_export.o
In file included from kernel/trace/trace_export.c:197: kernel/trace/trace_entries.h:58: error: 'perf_ftrace_event_register' undeclared here (not in a function)
make[2]: *** [kernel/trace/trace_export.o] Error 1
make[1]: *** [kernel/trace] Error 2
make: *** [kernel] Error 2
because as of ced390 (ftrace, perf: Add support to use function
tracepoint in perf) perf_trace_event_register() is declared in trace.h
only if CONFIG_PERF_EVENTS is enabled but I don't have that set.
Ensure that we always have a definition of perf_trace_event_register()
by making the definition unconditional.
Link: http://lkml.kernel.org/r/1330426967-17067-1-git-send-email-broonie@opensource.wolfsonmicro.com
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index ce887c0eca56..95059f091a24 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -836,13 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[]; | |||
836 | filter) | 836 | filter) |
837 | #include "trace_entries.h" | 837 | #include "trace_entries.h" |
838 | 838 | ||
839 | #ifdef CONFIG_PERF_EVENTS | ||
840 | #ifdef CONFIG_FUNCTION_TRACER | 839 | #ifdef CONFIG_FUNCTION_TRACER |
841 | int perf_ftrace_event_register(struct ftrace_event_call *call, | 840 | int perf_ftrace_event_register(struct ftrace_event_call *call, |
842 | enum trace_reg type, void *data); | 841 | enum trace_reg type, void *data); |
843 | #else | 842 | #else |
844 | #define perf_ftrace_event_register NULL | 843 | #define perf_ftrace_event_register NULL |
845 | #endif /* CONFIG_FUNCTION_TRACER */ | 844 | #endif /* CONFIG_FUNCTION_TRACER */ |
846 | #endif /* CONFIG_PERF_EVENTS */ | ||
847 | 845 | ||
848 | #endif /* _LINUX_KERNEL_TRACE_H */ | 846 | #endif /* _LINUX_KERNEL_TRACE_H */ |