From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
Date: Mon, 26 Mar 2012 14:33:01 +0100 [thread overview]
Message-ID: <1332768782-5201-1-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
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, 4 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 95059f0..ff639ca 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -836,11 +836,15 @@ 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 */
+#else
+#define perf_ftrace_event_register NULL
+#endif /* CONFIG_PERF_EVENTS */
#endif /* _LINUX_KERNEL_TRACE_H */
--
1.7.9.1
next reply other threads:[~2012-03-26 13:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-26 13:33 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-04-13 8:52 [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS Mark Brown
2012-04-11 8:20 Mark Brown
2012-04-11 12:18 ` Steven Rostedt
2012-04-12 18:36 ` Mark Brown
2012-02-28 11:02 Mark Brown
2012-02-28 11:10 ` Mark Brown
2012-02-28 14:57 ` Jiri Olsa
2012-03-13 22:33 ` Steven Rostedt
2012-03-13 23:03 ` Jiri Olsa
2012-02-28 11:10 ` Mark Brown
2012-02-28 13:21 ` Jiri Olsa
2012-02-28 13:37 ` Mark Brown
2012-02-28 14:02 ` Steven Rostedt
2012-02-28 14:03 ` Mark Brown
2012-02-28 14:43 ` Jiri Olsa
2012-02-28 14:52 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332768782-5201-1-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.