Merge 3.16-rc5 into char-misc-next

This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 37 insertions, 6 deletions

diff --git a/tools/lib/traceevent/plugin_function.c b/tools/lib/traceevent/plugin_function.c
index 80ba4ff1fe84..a00ec190821a 100644
--- a/tools/lib/traceevent/plugin_function.c
+++ b/tools/lib/traceevent/plugin_function.c
@@ -33,6 +33,29 @@ static int cpus = -1;
 
 #define STK_BLK 10
 
+struct pevent_plugin_option plugin_options[] =
+{
+        {
+                .name = "parent",
+                .plugin_alias = "ftrace",
+                .description =
+                "Print parent of functions for function events",
+        },
+        {
+                .name = "indent",
+                .plugin_alias = "ftrace",
+                .description =
+                "Try to show function call indents, based on parents",
+                .set = 1,
+        },
+        {
+                .name = NULL,
+        }
+};
+
+static struct pevent_plugin_option *ftrace_parent = &plugin_options[0];
+static struct pevent_plugin_option *ftrace_indent = &plugin_options[1];
+
 static void add_child(struct func_stack *stack, const char *child, int pos)
 {
         int i;
@@ -119,7 +142,8 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record,
 
         parent = pevent_find_function(pevent, pfunction);
 
-        index = add_and_get_index(parent, func, record->cpu);
+        if (parent && ftrace_indent->set)
+                index = add_and_get_index(parent, func, record->cpu);
 
         trace_seq_printf(s, "%*s", index*3, "");
 
@@ -128,11 +152,13 @@ static int function_handler(struct trace_seq *s, struct pevent_record *record,
         else
                 trace_seq_printf(s, "0x%llx", function);
 
-        trace_seq_printf(s, " <-- ");
-        if (parent)
-                trace_seq_printf(s, "%s", parent);
-        else
-                trace_seq_printf(s, "0x%llx", pfunction);
+        if (ftrace_parent->set) {
+                trace_seq_printf(s, " <-- ");
+                if (parent)
+                        trace_seq_printf(s, "%s", parent);
+                else
+                        trace_seq_printf(s, "0x%llx", pfunction);
+        }
 
         return 0;
 }
@@ -141,6 +167,9 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent)
 {
         pevent_register_event_handler(pevent, -1, "ftrace", "function",
                                       function_handler, NULL);
+
+        traceevent_plugin_add_options("ftrace", plugin_options);
+
         return 0;
 }
 
@@ -157,6 +186,8 @@ void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent)
                 free(fstack[i].stack);
         }
 
+        traceevent_plugin_remove_options(plugin_options);
+
         free(fstack);
         fstack = NULL;
         cpus = -1;