ftrace: Have the callbacks receive a struct ftrace_regs instead of pt_regs

[sfrench/cifs-2.6.git] / kernel / trace / trace_events.c

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 47a71f96e5bcc75ba160bcbd6ae8eecc81d45116..98d194d8460e1ac2f811dee7a800981abe879a24 100644 (file)
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2436,7 +2436,7 @@ void trace_event_eval_update(struct trace_eval_map **map, int len)
                /*
                 * Since calls are grouped by systems, the likelyhood that the
                 * next call in the iteration belongs to the same system as the
-                * previous call is high. As an optimization, we skip seaching
+                * previous call is high. As an optimization, we skip searching
                 * for a map[] that matches the call's system if the last call
                 * was from the same system. That's what last_i is for. If the
                 * call has the same system as the previous call, then last_i
@@ -3271,7 +3271,7 @@ create_event_toplevel_files(struct dentry *parent, struct trace_array *tr)
  *
  * When a new instance is created, it needs to set up its events
  * directory, as well as other files associated with events. It also
- * creates the event hierachry in the @parent/events directory.
+ * creates the event hierarchy in the @parent/events directory.
  *
  * Returns 0 on success.
  *
@@ -3673,7 +3673,7 @@ static struct trace_event_file event_trace_file __initdata;
 
 static void __init
 function_test_events_call(unsigned long ip, unsigned long parent_ip,
-                         struct ftrace_ops *op, struct pt_regs *pt_regs)
+                         struct ftrace_ops *op, struct ftrace_regs *regs)
 {
        struct trace_buffer *buffer;
        struct ring_buffer_event *event;
@@ -3712,7 +3712,6 @@ function_test_events_call(unsigned long ip, unsigned long parent_ip,
 static struct ftrace_ops trace_ops __initdata  =
 {
        .func = function_test_events_call,
-       .flags = FTRACE_OPS_FL_RECURSION_SAFE,
 };
 
 static __init void event_trace_self_test_with_function(void)