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

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

diff --git a/kernel/kernel/trace/trace_events_trigger.c b/kernel/kernel/trace/trace_events_trigger.c
index 8712df9..42a4009 100644 (file)
--- a/kernel/kernel/trace/trace_events_trigger.c
+++ b/kernel/kernel/trace/trace_events_trigger.c
@@ -40,7 +40,7 @@ trigger_data_free(struct event_trigger_data *data)
 
 /**
  * event_triggers_call - Call triggers associated with a trace event
- * @file: The ftrace_event_file associated with the event
+ * @file: The trace_event_file associated with the event
  * @rec: The trace entry for the event, NULL for unconditional invocation
  *
  * For each trigger associated with an event, invoke the trigger
@@ -63,7 +63,7 @@ trigger_data_free(struct event_trigger_data *data)
  * any trigger that should be deferred, ETT_NONE if nothing to defer.
  */
 enum event_trigger_type
-event_triggers_call(struct ftrace_event_file *file, void *rec)
+event_triggers_call(struct trace_event_file *file, void *rec)
 {
        struct event_trigger_data *data;
        enum event_trigger_type tt = ETT_NONE;
@@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
 
 /**
  * event_triggers_post_call - Call 'post_triggers' for a trace event
- * @file: The ftrace_event_file associated with the event
+ * @file: The trace_event_file associated with the event
  * @tt: enum event_trigger_type containing a set bit for each trigger to invoke
  *
  * For each trigger associated with an event, invoke the trigger
@@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
  * Called from tracepoint handlers (with rcu_read_lock_sched() held).
  */
 void
-event_triggers_post_call(struct ftrace_event_file *file,
+event_triggers_post_call(struct trace_event_file *file,
                         enum event_trigger_type tt)
 {
        struct event_trigger_data *data;
@@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(event_triggers_post_call);
 
 static void *trigger_next(struct seq_file *m, void *t, loff_t *pos)
 {
-       struct ftrace_event_file *event_file = event_file_data(m->private);
+       struct trace_event_file *event_file = event_file_data(m->private);
 
        if (t == SHOW_AVAILABLE_TRIGGERS)
                return NULL;
@@ -129,7 +129,7 @@ static void *trigger_next(struct seq_file *m, void *t, loff_t *pos)
 
 static void *trigger_start(struct seq_file *m, loff_t *pos)
 {
-       struct ftrace_event_file *event_file;
+       struct trace_event_file *event_file;
 
        /* ->stop() is called even if ->start() fails */
        mutex_lock(&event_mutex);
@@ -201,7 +201,7 @@ static int event_trigger_regex_open(struct inode *inode, struct file *file)
        return ret;
 }
 
-static int trigger_process_regex(struct ftrace_event_file *file, char *buff)
+static int trigger_process_regex(struct trace_event_file *file, char *buff)
 {
        char *command, *next = buff;
        struct event_command *p;
@@ -227,7 +227,7 @@ static ssize_t event_trigger_regex_write(struct file *file,
                                         const char __user *ubuf,
                                         size_t cnt, loff_t *ppos)
 {
-       struct ftrace_event_file *event_file;
+       struct trace_event_file *event_file;
        ssize_t ret;
        char *buf;
 
@@ -430,7 +430,7 @@ event_trigger_free(struct event_trigger_ops *ops,
                trigger_data_free(data);
 }
 
-static int trace_event_trigger_enable_disable(struct ftrace_event_file *file,
+static int trace_event_trigger_enable_disable(struct trace_event_file *file,
                                              int trigger_enable)
 {
        int ret = 0;
@@ -438,12 +438,12 @@ static int trace_event_trigger_enable_disable(struct ftrace_event_file *file,
        if (trigger_enable) {
                if (atomic_inc_return(&file->tm_ref) > 1)
                        return ret;
-               set_bit(FTRACE_EVENT_FL_TRIGGER_MODE_BIT, &file->flags);
+               set_bit(EVENT_FILE_FL_TRIGGER_MODE_BIT, &file->flags);
                ret = trace_event_enable_disable(file, 1, 1);
        } else {
                if (atomic_dec_return(&file->tm_ref) > 0)
                        return ret;
-               clear_bit(FTRACE_EVENT_FL_TRIGGER_MODE_BIT, &file->flags);
+               clear_bit(EVENT_FILE_FL_TRIGGER_MODE_BIT, &file->flags);
                ret = trace_event_enable_disable(file, 0, 1);
        }
 
@@ -466,7 +466,7 @@ static int trace_event_trigger_enable_disable(struct ftrace_event_file *file,
 void
 clear_event_triggers(struct trace_array *tr)
 {
-       struct ftrace_event_file *file;
+       struct trace_event_file *file;
 
        list_for_each_entry(file, &tr->events, list) {
                struct event_trigger_data *data;
@@ -480,7 +480,7 @@ clear_event_triggers(struct trace_array *tr)
 
 /**
  * update_cond_flag - Set or reset the TRIGGER_COND bit
- * @file: The ftrace_event_file associated with the event
+ * @file: The trace_event_file associated with the event
  *
  * If an event has triggers and any of those triggers has a filter or
  * a post_trigger, trigger invocation needs to be deferred until after
@@ -488,7 +488,7 @@ clear_event_triggers(struct trace_array *tr)
  * its TRIGGER_COND bit set, otherwise the TRIGGER_COND bit should be
  * cleared.
  */
-static void update_cond_flag(struct ftrace_event_file *file)
+static void update_cond_flag(struct trace_event_file *file)
 {
        struct event_trigger_data *data;
        bool set_cond = false;
@@ -501,9 +501,9 @@ static void update_cond_flag(struct ftrace_event_file *file)
        }
 
        if (set_cond)
-               set_bit(FTRACE_EVENT_FL_TRIGGER_COND_BIT, &file->flags);
+               set_bit(EVENT_FILE_FL_TRIGGER_COND_BIT, &file->flags);
        else
-               clear_bit(FTRACE_EVENT_FL_TRIGGER_COND_BIT, &file->flags);
+               clear_bit(EVENT_FILE_FL_TRIGGER_COND_BIT, &file->flags);
 }
 
 /**
@@ -511,7 +511,7 @@ static void update_cond_flag(struct ftrace_event_file *file)
  * @glob: The raw string used to register the trigger
  * @ops: The trigger ops associated with the trigger
  * @data: Trigger-specific data to associate with the trigger
- * @file: The ftrace_event_file associated with the event
+ * @file: The trace_event_file associated with the event
  *
  * Common implementation for event trigger registration.
  *
@@ -522,7 +522,7 @@ static void update_cond_flag(struct ftrace_event_file *file)
  */
 static int register_trigger(char *glob, struct event_trigger_ops *ops,
                            struct event_trigger_data *data,
-                           struct ftrace_event_file *file)
+                           struct trace_event_file *file)
 {
        struct event_trigger_data *test;
        int ret = 0;
@@ -557,7 +557,7 @@ out:
  * @glob: The raw string used to register the trigger
  * @ops: The trigger ops associated with the trigger
  * @test: Trigger-specific data used to find the trigger to remove
- * @file: The ftrace_event_file associated with the event
+ * @file: The trace_event_file associated with the event
  *
  * Common implementation for event trigger unregistration.
  *
@@ -566,7 +566,7 @@ out:
  */
 static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
                               struct event_trigger_data *test,
-                              struct ftrace_event_file *file)
+                              struct trace_event_file *file)
 {
        struct event_trigger_data *data;
        bool unregistered = false;
@@ -588,7 +588,7 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
 /**
  * event_trigger_callback - Generic event_command @func implementation
  * @cmd_ops: The command ops, used for trigger registration
- * @file: The ftrace_event_file associated with the event
+ * @file: The trace_event_file associated with the event
  * @glob: The raw string used to register the trigger
  * @cmd: The cmd portion of the string used to register the trigger
  * @param: The params portion of the string used to register the trigger
@@ -603,7 +603,7 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
  */
 static int
 event_trigger_callback(struct event_command *cmd_ops,
-                      struct ftrace_event_file *file,
+                      struct trace_event_file *file,
                       char *glob, char *cmd, char *param)
 {
        struct event_trigger_data *trigger_data;
@@ -688,7 +688,7 @@ event_trigger_callback(struct event_command *cmd_ops,
  * set_trigger_filter - Generic event_command @set_filter implementation
  * @filter_str: The filter string for the trigger, NULL to remove filter
  * @trigger_data: Trigger-specific data
- * @file: The ftrace_event_file associated with the event
+ * @file: The trace_event_file associated with the event
  *
  * Common implementation for event command filter parsing and filter
  * instantiation.
@@ -702,7 +702,7 @@ event_trigger_callback(struct event_command *cmd_ops,
  */
 static int set_trigger_filter(char *filter_str,
                              struct event_trigger_data *trigger_data,
-                             struct ftrace_event_file *file)
+                             struct trace_event_file *file)
 {
        struct event_trigger_data *data = trigger_data;
        struct event_filter *filter = NULL, *tmp;
@@ -900,7 +900,7 @@ snapshot_count_trigger(struct event_trigger_data *data)
 static int
 register_snapshot_trigger(char *glob, struct event_trigger_ops *ops,
                          struct event_trigger_data *data,
-                         struct ftrace_event_file *file)
+                         struct trace_event_file *file)
 {
        int ret = register_trigger(glob, ops, data, file);
 
@@ -968,7 +968,7 @@ static __init int register_trigger_snapshot_cmd(void) { return 0; }
  * Skip 3:
  *   stacktrace_trigger()
  *   event_triggers_post_call()
- *   ftrace_raw_event_xxx()
+ *   trace_event_raw_event_xxx()
  */
 #define STACK_SKIP 3
 
@@ -1053,7 +1053,7 @@ static __init void unregister_trigger_traceon_traceoff_cmds(void)
 #define DISABLE_EVENT_STR      "disable_event"
 
 struct enable_trigger_data {
-       struct ftrace_event_file        *file;
+       struct trace_event_file         *file;
        bool                            enable;
 };
 
@@ -1063,9 +1063,9 @@ event_enable_trigger(struct event_trigger_data *data)
        struct enable_trigger_data *enable_data = data->private_data;
 
        if (enable_data->enable)
-               clear_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &enable_data->file->flags);
+               clear_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &enable_data->file->flags);
        else
-               set_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &enable_data->file->flags);
+               set_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &enable_data->file->flags);
 }
 
 static void
@@ -1077,7 +1077,7 @@ event_enable_count_trigger(struct event_trigger_data *data)
                return;
 
        /* Skip if the event is in a state we want to switch to */
-       if (enable_data->enable == !(enable_data->file->flags & FTRACE_EVENT_FL_SOFT_DISABLED))
+       if (enable_data->enable == !(enable_data->file->flags & EVENT_FILE_FL_SOFT_DISABLED))
                return;
 
        if (data->count != -1)
@@ -1095,7 +1095,7 @@ event_enable_trigger_print(struct seq_file *m, struct event_trigger_ops *ops,
        seq_printf(m, "%s:%s:%s",
                   enable_data->enable ? ENABLE_EVENT_STR : DISABLE_EVENT_STR,
                   enable_data->file->event_call->class->system,
-                  ftrace_event_name(enable_data->file->event_call));
+                  trace_event_name(enable_data->file->event_call));
 
        if (data->count == -1)
                seq_puts(m, ":unlimited");
@@ -1159,10 +1159,10 @@ static struct event_trigger_ops event_disable_count_trigger_ops = {
 
 static int
 event_enable_trigger_func(struct event_command *cmd_ops,
-                         struct ftrace_event_file *file,
+                         struct trace_event_file *file,
                          char *glob, char *cmd, char *param)
 {
-       struct ftrace_event_file *event_enable_file;
+       struct trace_event_file *event_enable_file;
        struct enable_trigger_data *enable_data;
        struct event_trigger_data *trigger_data;
        struct event_trigger_ops *trigger_ops;
@@ -1294,7 +1294,7 @@ event_enable_trigger_func(struct event_command *cmd_ops,
 static int event_enable_register_trigger(char *glob,
                                         struct event_trigger_ops *ops,
                                         struct event_trigger_data *data,
-                                        struct ftrace_event_file *file)
+                                        struct trace_event_file *file)
 {
        struct enable_trigger_data *enable_data = data->private_data;
        struct enable_trigger_data *test_enable_data;
@@ -1331,7 +1331,7 @@ out:
 static void event_enable_unregister_trigger(char *glob,
                                            struct event_trigger_ops *ops,
                                            struct event_trigger_data *test,
-                                           struct ftrace_event_file *file)
+                                           struct trace_event_file *file)
 {
        struct enable_trigger_data *test_enable_data = test->private_data;
        struct enable_trigger_data *enable_data;