lkml.org 
[lkml]   [2010]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 7/8] tracing: Remove redundant raw_init callbacks
    raw_init callback is optional.

    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    ---
    kernel/trace/trace_export.c | 8 +-------
    kernel/trace/trace_kprobe.c | 10 +---------
    2 files changed, 2 insertions(+), 16 deletions(-)

    diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
    index 8536e2a..4ba44de 100644
    --- a/kernel/trace/trace_export.c
    +++ b/kernel/trace/trace_export.c
    @@ -125,12 +125,6 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \

    #include "trace_entries.h"

    -static int ftrace_raw_init_event(struct ftrace_event_call *call)
    -{
    - INIT_LIST_HEAD(&call->class->fields);
    - return 0;
    -}
    -
    #undef __entry
    #define __entry REC

    @@ -158,7 +152,7 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call)
    struct ftrace_event_class event_class_ftrace_##call = { \
    .system = __stringify(TRACE_SYSTEM), \
    .define_fields = ftrace_define_fields_##call, \
    - .raw_init = ftrace_raw_init_event, \
    + .fields = LIST_HEAD_INIT(event_class_ftrace_##call.fields),\
    }; \
    \
    struct ftrace_event_call __used \
    diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
    index faf7cef..fed5919 100644
    --- a/kernel/trace/trace_kprobe.c
    +++ b/kernel/trace/trace_kprobe.c
    @@ -1214,11 +1214,6 @@ static void probe_event_disable(struct ftrace_event_call *call)
    }
    }

    -static int probe_event_raw_init(struct ftrace_event_call *event_call)
    -{
    - return 0;
    -}
    -
    #undef DEFINE_FIELD
    #define DEFINE_FIELD(type, item, name, is_signed) \
    do { \
    @@ -1486,15 +1481,12 @@ static int register_probe_event(struct trace_probe *tp)
    int ret;

    /* Initialize ftrace_event_call */
    + INIT_LIST_HEAD(&call->class->fields);
    if (probe_is_return(tp)) {
    - INIT_LIST_HEAD(&call->class->fields);
    call->event.funcs = &kretprobe_funcs;
    - call->class->raw_init = probe_event_raw_init;
    call->class->define_fields = kretprobe_event_define_fields;
    } else {
    - INIT_LIST_HEAD(&call->class->fields);
    call->event.funcs = &kprobe_funcs;
    - call->class->raw_init = probe_event_raw_init;
    call->class->define_fields = kprobe_event_define_fields;
    }
    if (set_print_fmt(tp) < 0)
    --
    1.6.3


    \
     
     \ /
      Last update: 2010-05-24 10:25    [W:0.022 / U:2.116 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site