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: Tue, 28 Feb 2012 11:02:46 +0000 [thread overview]
Message-ID: <1330426967-17067-1-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
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.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
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 54faec7..3dd357c 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -835,13 +835,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 */
--
1.7.9.1
next reply other threads:[~2012-02-28 11:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 11:02 Mark Brown [this message]
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-03-22 21:21 ` [tip:perf/urgent] perf: Add ifdef to remove unused enum switch warnings tip-bot for Jiri Olsa
2012-02-28 11:10 ` [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS 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
2012-03-22 21:20 ` [tip:perf/urgent] tracing: " tip-bot for Mark Brown
2012-03-26 13:33 [PATCH] trace: " Mark Brown
2012-04-11 8:20 Mark Brown
2012-04-11 12:18 ` Steven Rostedt
2012-04-12 18:36 ` Mark Brown
2012-04-13 8:52 Mark Brown
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=1330426967-17067-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome