[PATCH][GIT PULL][v3.4] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

[PATCH][GIT PULL][v3.4] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

[Steven Rostedt]

Ingo,

Linux mainline compile is broken for archs that can disable CONFIG_PERF_EVENTS.
Without this patch, arm fails to build, but with it, it works fine.

The breakage went in during the 3.4 merge window.

-- Steve


Please pull the latest tip/perf/urgent tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/urgent

Head SHA1: 12524b1bcf06b86bba3869772084a5fd7a0db61d


Mark Brown (1):
      tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

----
 kernel/trace/trace.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---------------------------
commit 12524b1bcf06b86bba3869772084a5fd7a0db61d
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Wed Apr 11 09:20:29 2012 +0100

    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/1334132429-6091-1-git-send-email-broonie@opensource.wolfsonmicro.com
    
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

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 */

Re: [PATCH][GIT PULL][v3.4] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

[Steven Rostedt]

On Thu, 2012-04-12 at 16:25 -0400, Steven Rostedt wrote:
> 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"
>  

Looking at this patch in more depth, it may be cleaner to do:

#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

Mark, would you like to make the above update?

Thanks,

-- Steve


> +#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 */
> 

Re: [PATCH][GIT PULL][v3.4] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

On Thu, Apr 12, 2012 at 04:39:53PM -0400, Steven Rostedt wrote:

> Looking at this patch in more depth, it may be cleaner to do:

> #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

> Mark, would you like to make the above update?

I've sent a revised version of the patch out.  I really don't care which
version gets merged or who writes the patch so long as we can get this
fixed.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH][GIT PULL][v3.4] tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)

[Steven Rostedt]

On Fri, 2012-04-13 at 09:53 +0100, Mark Brown wrote:
> On Thu, Apr 12, 2012 at 04:39:53PM -0400, Steven Rostedt wrote:
> 
> > Looking at this patch in more depth, it may be cleaner to do:
> 
> > #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
> 
> > Mark, would you like to make the above update?
> 
> I've sent a revised version of the patch out.  I really don't care which
> version gets merged or who writes the patch so long as we can get this
> fixed.

I know it's trivial, but people do get upset when one developer redoes
the work of another. But thanks! I'm adding it to my tree now and
testing it.

-- Steve