mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
@ 2012-02-28 11:02 Mark Brown
  2012-02-28 11:10 ` Mark Brown
                   ` (3 more replies)
  0 siblings, 4 replies; 14+ messages in thread
From: Mark Brown @ 2012-02-28 11:02 UTC (permalink / raw)
  To: Steven Rostedt, Frederic Weisbecker, Ingo Molnar, Jiri Olsa
  Cc: linux-kernel, Mark Brown

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


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2012-03-22 21:21 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-28 11:02 [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS 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-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

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