[PATCH 1/2] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

From: Steven Rostedt
Date: Tue Apr 17 2012 - 21:05:53 EST

From: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>

Today's -next fails to link for me:

kernel/built-in.o:(.data+0x178e50): undefined reference to `perf_ftrace_event_register'

It looks like multiple fixes have been merged for the issue fixed by
commit fa73dc9 (tracing: Fix build breakage without CONFIG_PERF_EVENTS)
though I can't identify the other changes that have gone in at the
minute, it's possible that the changes which caused the breakage fixed
by the previous commit got dropped but the fix made it in.

Link: http://lkml.kernel.org/r/1334307179-21255-1-git-send-email-broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx

Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
kernel/trace/trace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 95059f0..f95d65d 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -836,11 +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 */

Attachment: signature.asc
Description: This is a digitally signed message part