]> git.karo-electronics.de Git - linux-beck.git/commit
tracing: Fix build breakage without CONFIG_PERF_EVENTS
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 28 Feb 2012 11:02:46 +0000 (11:02 +0000)
committerSteven Rostedt <rostedt@goodmis.org>
Tue, 13 Mar 2012 22:34:59 +0000 (18:34 -0400)
commitfa73dc9400516945bcbae8d98c23393bcefe1440
treef63deadc3b24a2534646dc7dff626fc7102fabe5
parentdb6544e0075d192e5ad16eda8689c55fa9c6f8f4
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>
kernel/trace/trace.h