lkml.org 
[lkml]   [2012]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH] trace: Fix build breakage without CONFIG_PERF_EVENTS
    From
    Date
    Hi Mark,

    Please change your subject when you submit a new patch. I've ignored
    your last one because I thought I already applied it.

    Your first patch:

    http://marc.info/?l=linux-kernel&m=133042701226637

    Which was applied:

    https://lkml.org/lkml/2012/3/14/304


    Your second patch:

    https://lkml.org/lkml/2012/3/26/164

    As with this one, has the same subject. I only noticed it as I was about
    to tell you that it was already applied.

    Thanks,

    -- Steve


    On Wed, 2012-04-11 at 09:20 +0100, Mark Brown wrote:
    > 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 */




    \
     
     \ /
      Last update: 2012-04-11 14:21    [W:0.024 / U:59.468 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site