lkml.org 
[lkml]   [2012]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
    Date
    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


    \
     
     \ /
      Last update: 2012-03-26 15:35    [W:0.021 / U:91.632 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site