tracing: Rename (un)register_ftrace_event() to (un)register_trace_event()

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The functions (un)register_ftrace_event() is
really about trace_events, and the name should be register_trace_event()
instead.

Also renamed ftrace_event_reg() to trace_event_reg() for the same reason.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 29627cbafdead1565a68bc534a04c1ad051bedc3..99924c07a042c5ea94ea1fd147a8e6320f0d73b8 100644 (file)
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -132,8 +132,8 @@ struct trace_event {
        struct trace_event_functions    *funcs;
 };
 
-extern int register_ftrace_event(struct trace_event *event);
-extern int unregister_ftrace_event(struct trace_event *event);
+extern int register_trace_event(struct trace_event *event);
+extern int unregister_trace_event(struct trace_event *event);
 
 /* Return values for print_line callback */
 enum print_line_t {
@@ -216,7 +216,7 @@ struct ftrace_event_class {
        int                     (*raw_init)(struct ftrace_event_call *);
 };
 
-extern int ftrace_event_reg(struct ftrace_event_call *event,
+extern int trace_event_reg(struct ftrace_event_call *event,
                            enum trace_reg type, void *data);
 
 struct ftrace_event_buffer {

diff --git a/include/trace/perf.h b/include/trace/perf.h
index 5e82add1647b7f6d818201fbd9bf5a68966fa6d1..bb751a5975dda1497849d6b6fe631bf3b531a2ff 100644 (file)
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -69,7 +69,7 @@
  *     .fields                 = LIST_HEAD_INIT(event_class_##call.fields),
  *     .raw_init               = trace_event_raw_init,
  *     .probe                  = ftrace_raw_event_##call,
- *     .reg                    = ftrace_event_reg,
+ *     .reg                    = trace_event_reg,
  * };
  *
  * static struct ftrace_event_call event_<call> = {
@@ -219,7 +219,7 @@ static struct ftrace_event_class __used __refdata event_class_##call = { \
        .fields                 = LIST_HEAD_INIT(event_class_##call.fields),\
        .raw_init               = trace_event_raw_init,                 \
        .probe                  = ftrace_raw_event_##call,              \
-       .reg                    = ftrace_event_reg,                     \
+       .reg                    = trace_event_reg,                      \
        _TRACE_PERF_INIT(call)                                          \
 };
 

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 483cecfa5c174d6a74c54d5663b8b00578759d11..4ba2b8ecc81ca64ce558329956a2902266b03b1f 100644 (file)
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1450,14 +1450,14 @@ static struct trace_event trace_blk_event = {
 
 static int __init init_blk_tracer(void)
 {
-       if (!register_ftrace_event(&trace_blk_event)) {
+       if (!register_trace_event(&trace_blk_event)) {
                pr_warning("Warning: could not register block events\n");
                return 1;
        }
 
        if (register_tracer(&blk_tracer) != 0) {
                pr_warning("Warning: could not register the block tracer\n");
-               unregister_ftrace_event(&trace_blk_event);
+               unregister_trace_event(&trace_blk_event);
                return 1;
        }
 

diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 57cbf1efdd44053a8f94cace3a57dce22a476589..bdfcb44d5d4a732bc45ce025b69043e0d799f345 100644 (file)
--- a/kernel/trace/trace_branch.c
+++ b/kernel/trace/trace_branch.c
@@ -191,7 +191,7 @@ __init static int init_branch_tracer(void)
 {
        int ret;
 
-       ret = register_ftrace_event(&trace_branch_event);
+       ret = register_trace_event(&trace_branch_event);
        if (!ret) {
                printk(KERN_WARNING "Warning: could not register "
                                    "branch events\n");

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index c4de47fc5cca0799a58a72cdb50321e95fd7b4ff..5fbb06c6c3ec18587d8593f31340a1dcc7373ba7 100644 (file)
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -182,7 +182,7 @@ int trace_event_raw_init(struct ftrace_event_call *call)
 {
        int id;
 
-       id = register_ftrace_event(&call->event);
+       id = register_trace_event(&call->event);
        if (!id)
                return -ENODEV;
 
@@ -252,8 +252,8 @@ void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer)
 }
 EXPORT_SYMBOL_GPL(ftrace_event_buffer_commit);
 
-int ftrace_event_reg(struct ftrace_event_call *call,
-                    enum trace_reg type, void *data)
+int trace_event_reg(struct ftrace_event_call *call,
+                   enum trace_reg type, void *data)
 {
        struct ftrace_event_file *file = data;
 
@@ -288,7 +288,7 @@ int ftrace_event_reg(struct ftrace_event_call *call,
        }
        return 0;
 }
-EXPORT_SYMBOL_GPL(ftrace_event_reg);
+EXPORT_SYMBOL_GPL(trace_event_reg);
 
 void trace_event_enable_cmd_record(bool enable)
 {
@@ -1673,7 +1673,7 @@ static void event_remove(struct ftrace_event_call *call)
        } while_for_each_event_file();
 
        if (call->event.funcs)
-               __unregister_ftrace_event(&call->event);
+               __unregister_trace_event(&call->event);
        remove_event_from_tracers(call);
        list_del(&call->list);
 }

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index a51e79688455edb5afb76f09ff2d70c0eae15ca5..32e76a21b8d4cf5a5f0829696130c2ff8484e194 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -1454,12 +1454,12 @@ static __init int init_graph_trace(void)
 {
        max_bytes_for_cpu = snprintf(NULL, 0, "%d", nr_cpu_ids - 1);
 
-       if (!register_ftrace_event(&graph_trace_entry_event)) {
+       if (!register_trace_event(&graph_trace_entry_event)) {
                pr_warning("Warning: could not register graph trace events\n");
                return 1;
        }
 
-       if (!register_ftrace_event(&graph_trace_ret_event)) {
+       if (!register_trace_event(&graph_trace_ret_event)) {
                pr_warning("Warning: could not register graph trace events\n");
                return 1;
        }

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index d0ce590f06e17a34c61c3d5c1ab805bb1b633c61..59c35210a7e7a771f322250efb8578da60e41fd7 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1290,7 +1290,7 @@ static int register_kprobe_event(struct trace_kprobe *tk)
        }
        if (set_print_fmt(&tk->tp, trace_kprobe_is_return(tk)) < 0)
                return -ENOMEM;
-       ret = register_ftrace_event(&call->event);
+       ret = register_trace_event(&call->event);
        if (!ret) {
                kfree(call->print_fmt);
                return -ENODEV;
@@ -1303,7 +1303,7 @@ static int register_kprobe_event(struct trace_kprobe *tk)
                pr_info("Failed to register kprobe event: %s\n",
                        ftrace_event_name(call));
                kfree(call->print_fmt);
-               unregister_ftrace_event(&call->event);
+               unregister_trace_event(&call->event);
        }
        return ret;
 }

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 4243bf620a27cb1b99ffda0bb2966d0e4e50b6ef..6469906e890d2365f5abb82fe794d61d851e7f75 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -693,7 +693,7 @@ void trace_event_read_unlock(void)
 }
 
 /**
- * register_ftrace_event - register output for an event type
+ * register_trace_event - register output for an event type
  * @event: the event type to register
  *
  * Event types are stored in a hash and this hash is used to
@@ -707,7 +707,7 @@ void trace_event_read_unlock(void)
  *
  * Returns the event type number or zero on error.
  */
-int register_ftrace_event(struct trace_event *event)
+int register_trace_event(struct trace_event *event)
 {
        unsigned key;
        int ret = 0;
@@ -771,12 +771,12 @@ int register_ftrace_event(struct trace_event *event)
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(register_ftrace_event);
+EXPORT_SYMBOL_GPL(register_trace_event);
 
 /*
  * Used by module code with the trace_event_sem held for write.
  */
-int __unregister_ftrace_event(struct trace_event *event)
+int __unregister_trace_event(struct trace_event *event)
 {
        hlist_del(&event->node);
        list_del(&event->list);
@@ -784,18 +784,18 @@ int __unregister_ftrace_event(struct trace_event *event)
 }
 
 /**
- * unregister_ftrace_event - remove a no longer used event
+ * unregister_trace_event - remove a no longer used event
  * @event: the event to remove
  */
-int unregister_ftrace_event(struct trace_event *event)
+int unregister_trace_event(struct trace_event *event)
 {
        down_write(&trace_event_sem);
-       __unregister_ftrace_event(event);
+       __unregister_trace_event(event);
        up_write(&trace_event_sem);
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(unregister_ftrace_event);
+EXPORT_SYMBOL_GPL(unregister_trace_event);
 
 /*
  * Standard events
@@ -1243,7 +1243,7 @@ __init static int init_events(void)
        for (i = 0; events[i]; i++) {
                event = events[i];
 
-               ret = register_ftrace_event(event);
+               ret = register_trace_event(event);
                if (!ret) {
                        printk(KERN_WARNING "event %d failed to register\n",
                               event->type);

diff --git a/kernel/trace/trace_output.h b/kernel/trace/trace_output.h
index 8ef2c40efb3cdfeab0eea320f58634b46b4850d6..4cbfe85b99c80a5a8e245dc2d8c3afee26f7009a 100644 (file)
--- a/kernel/trace/trace_output.h
+++ b/kernel/trace/trace_output.h
@@ -32,7 +32,7 @@ extern int
 trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry);
 
 /* used by module unregistering */
-extern int __unregister_ftrace_event(struct trace_event *event);
+extern int __unregister_trace_event(struct trace_event *event);
 extern struct rw_semaphore trace_event_sem;
 
 #define SEQ_PUT_FIELD(s, x)                            \

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 6dd022c7b5bcbfc68f3f92ce322c9b83cf4add4e..c8e45d8d6a922964bf7c35573e2e5aa7f65a9bd9 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -1283,7 +1283,7 @@ static int register_uprobe_event(struct trace_uprobe *tu)
        if (set_print_fmt(&tu->tp, is_ret_probe(tu)) < 0)
                return -ENOMEM;
 
-       ret = register_ftrace_event(&call->event);
+       ret = register_trace_event(&call->event);
        if (!ret) {
                kfree(call->print_fmt);
                return -ENODEV;
@@ -1297,7 +1297,7 @@ static int register_uprobe_event(struct trace_uprobe *tu)
                pr_info("Failed to register uprobe event: %s\n",
                        ftrace_event_name(call));
                kfree(call->print_fmt);
-               unregister_ftrace_event(&call->event);
+               unregister_trace_event(&call->event);
        }
 
        return ret;