All of lore.kernel.org
 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; 19+ 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 related	[flat|nested] 19+ messages in thread
* [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
@ 2012-03-26 13:33 Mark Brown
  0 siblings, 0 replies; 19+ messages in thread
From: Mark Brown @ 2012-03-26 13:33 UTC (permalink / raw)
  To: Steven Rostedt, Frederic Weisbecker, Ingo Molnar, Jiri Olsa
  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, 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


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
@ 2012-04-11  8:20 Mark Brown
  2012-04-11 12:18 ` Steven Rostedt
  0 siblings, 1 reply; 19+ messages in thread
From: Mark Brown @ 2012-04-11  8:20 UTC (permalink / raw)
  To: Steven Rostedt, Frederic Weisbecker, Ingo Molnar, Jiri Olsa
  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, 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


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
@ 2012-04-13  8:52 Mark Brown
  0 siblings, 0 replies; 19+ 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] 19+ messages in thread
end of thread, other threads:[~2012-04-13  8:53 UTC | newest]

Thread overview: 19+ 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
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

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.