* [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
@ 2012-04-13 8:52 Mark Brown
2012-04-25 13:45 ` [tip:perf/urgent] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again) tip-bot for Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2012-04-13 8:52 UTC (permalink / raw)
To: Steven Rostedt, Frederic Weisbecker, Ingo Molnar; +Cc: linux-kernel, Mark Brown
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.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
kernel/trace/trace.h | 4 ++--
1 files 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[];
filter)
#include "trace_entries.h"
-#ifdef CONFIG_FUNCTION_TRACER
+#if defined(CONFIG_PERF_EVENTS) && defined(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
#endif /* _LINUX_KERNEL_TRACE_H */
--
1.7.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:perf/urgent] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)
2012-04-13 8:52 [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS Mark Brown
@ 2012-04-25 13:45 ` tip-bot for Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Mark Brown @ 2012-04-25 13:45 UTC (permalink / raw)
To: linux-tip-commits
Cc: mingo, linux-kernel, hpa, mingo, fweisbec, broonie, rostedt, tglx
Commit-ID: 6e48b550d1f5f1919e6500547ae14a73fbf66c7b
Gitweb: http://git.kernel.org/tip/6e48b550d1f5f1919e6500547ae14a73fbf66c7b
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
AuthorDate: Fri, 13 Apr 2012 09:52:59 +0100
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Fri, 13 Apr 2012 21:37:04 -0400
tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)
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@opensource.wolfsonmicro.com
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/trace.h | 4 ++--
1 files 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[];
filter)
#include "trace_entries.h"
-#ifdef CONFIG_FUNCTION_TRACER
+#if defined(CONFIG_PERF_EVENTS) && defined(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
#endif /* _LINUX_KERNEL_TRACE_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-25 13:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-13 8:52 [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS Mark Brown
2012-04-25 13:45 ` [tip:perf/urgent] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again) tip-bot for Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.