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

[kvmfornfv.git] / kernel / kernel / trace / trace_probe.h

diff --git a/kernel/kernel/trace/trace_probe.h b/kernel/kernel/trace/trace_probe.h
index ab283e1..f6398db 100644 (file)
--- a/kernel/kernel/trace/trace_probe.h
+++ b/kernel/kernel/trace/trace_probe.h
@@ -272,8 +272,8 @@ struct probe_arg {
 
 struct trace_probe {
        unsigned int                    flags;  /* For TP_FLAG_* */
-       struct ftrace_event_class       class;
-       struct ftrace_event_call        call;
+       struct trace_event_class        class;
+       struct trace_event_call         call;
        struct list_head                files;
        ssize_t                         size;   /* trace entry size */
        unsigned int                    nr_args;
@@ -281,7 +281,7 @@ struct trace_probe {
 };
 
 struct event_file_link {
-       struct ftrace_event_file        *file;
+       struct trace_event_file         *file;
        struct list_head                list;
 };
 
@@ -302,19 +302,19 @@ static nokprobe_inline void call_fetch(struct fetch_param *fprm,
 }
 
 /* Check the name is good for event/group/fields */
-static inline int is_good_name(const char *name)
+static inline bool is_good_name(const char *name)
 {
        if (!isalpha(*name) && *name != '_')
-               return 0;
+               return false;
        while (*++name != '\0') {
                if (!isalpha(*name) && !isdigit(*name) && *name != '_')
-                       return 0;
+                       return false;
        }
-       return 1;
+       return true;
 }
 
 static inline struct event_file_link *
-find_event_file_link(struct trace_probe *tp, struct ftrace_event_file *file)
+find_event_file_link(struct trace_probe *tp, struct trace_event_file *file)
 {
        struct event_file_link *link;