Commit fa73dc94 authored by Mark Brown's avatar Mark Brown Committed by Steven Rostedt
Browse files

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.


Cc: Frederic Weisbecker <>
Cc: Ingo Molnar <>
Cc: Jiri Olsa <>
Signed-off-by: default avatarMark Brown <>
Signed-off-by: default avatarSteven Rostedt <>
parent db6544e0
......@@ -836,13 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[];
#include "trace_entries.h"
int perf_ftrace_event_register(struct ftrace_event_call *call,
enum trace_reg type, void *data);
#define perf_ftrace_event_register NULL
#endif /* _LINUX_KERNEL_TRACE_H */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment