[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-fa73dc9400516945bcbae8d98c23393bcefe1440@git.kernel.org>
Date: Thu, 22 Mar 2012 14:20:19 -0700
From: tip-bot for Mark Brown <broonie@...nsource.wolfsonmicro.com>
To: linux-tip-commits@...r.kernel.org
Cc: mingo@...hat.com, linux-kernel@...r.kernel.org, hpa@...or.com,
mingo@...nel.org, jolsa@...hat.com, fweisbec@...il.com,
broonie@...nsource.wolfsonmicro.com, rostedt@...dmis.org,
tglx@...utronix.de
Subject: [tip:perf/urgent] tracing:
Fix build breakage without CONFIG_PERF_EVENTS
Commit-ID: fa73dc9400516945bcbae8d98c23393bcefe1440
Gitweb: http://git.kernel.org/tip/fa73dc9400516945bcbae8d98c23393bcefe1440
Author: Mark Brown <broonie@...nsource.wolfsonmicro.com>
AuthorDate: Tue, 28 Feb 2012 11:02:46 +0000
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Tue, 13 Mar 2012 18:34:59 -0400
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@...il.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Signed-off-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
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 ce887c0..95059f0 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -836,13 +836,11 @@ extern const char *__stop___trace_bprintk_fmt[];
filter)
#include "trace_entries.h"
-#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 */
-#endif /* CONFIG_PERF_EVENTS */
#endif /* _LINUX_KERNEL_TRACE_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists