These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / kernel / trace / trace_export.c

diff --git a/kernel/kernel/trace/trace_export.c b/kernel/kernel/trace/trace_export.c
index 174a6a7..39aa7aa 100644 (file)
--- a/kernel/kernel/trace/trace_export.c
+++ b/kernel/kernel/trace/trace_export.c
@@ -125,7 +125,7 @@ static void __always_unused ____ftrace_check_##name(void)           \
 #undef FTRACE_ENTRY
 #define FTRACE_ENTRY(name, struct_name, id, tstruct, print, filter)    \
 static int __init                                                      \
-ftrace_define_fields_##name(struct ftrace_event_call *event_call)      \
+ftrace_define_fields_##name(struct trace_event_call *event_call)       \
 {                                                                      \
        struct struct_name field;                                       \
        int ret;                                                        \
@@ -163,14 +163,14 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \
 #define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\
                         regfn)                                         \
                                                                        \
-struct ftrace_event_class __refdata event_class_ftrace_##call = {      \
+struct trace_event_class __refdata event_class_ftrace_##call = {       \
        .system                 = __stringify(TRACE_SYSTEM),            \
        .define_fields          = ftrace_define_fields_##call,          \
        .fields                 = LIST_HEAD_INIT(event_class_ftrace_##call.fields),\
        .reg                    = regfn,                                \
 };                                                                     \
                                                                        \
-struct ftrace_event_call __used event_##call = {                       \
+struct trace_event_call __used event_##call = {                                \
        .class                  = &event_class_ftrace_##call,           \
        {                                                               \
                .name                   = #call,                        \
@@ -179,7 +179,7 @@ struct ftrace_event_call __used event_##call = {                    \
        .print_fmt              = print,                                \
        .flags                  = TRACE_EVENT_FL_IGNORE_ENABLE,         \
 };                                                                     \
-struct ftrace_event_call __used                                                \
+struct trace_event_call __used                                         \
 __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call;
 
 #undef FTRACE_ENTRY
@@ -187,7 +187,7 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call;
        FTRACE_ENTRY_REG(call, struct_name, etype,                      \
                         PARAMS(tstruct), PARAMS(print), filter, NULL)
 
-int ftrace_event_is_function(struct ftrace_event_call *call)
+bool ftrace_event_is_function(struct trace_event_call *call)
 {
        return call == &event_function;
 }