tracing/boot: Fix a hist trigger dependency for boot time tracing

Fixes a build error when CONFIG_HIST_TRIGGERS=n with boot-time
tracing. Since the trigger_process_regex() is defined only
when CONFIG_HIST_TRIGGERS=y, if it is disabled, the 'actions'
event option also must be disabled.

Link: https://lkml.kernel.org/r/162856123376.203126.582144262622247352.stgit@devnote2
Fixes: 0e0db28ef497 ("tracing/boot: Add per-event settings")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index 94ef2d099e3223dfd018c1c61a59c6fab4cd258e..d713714cba67f5c30cdc20363e7058a046c1eb11 100644 (file)
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -205,12 +205,15 @@ trace_boot_init_one_event(struct trace_array *tr, struct xbc_node *gnode,
                        pr_err("Failed to apply filter: %s\n", buf);
        }
 
-       xbc_node_for_each_array_value(enode, "actions", anode, p) {
-               if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf))
-                       pr_err("action string is too long: %s\n", p);
-               else if (trigger_process_regex(file, buf) < 0)
-                       pr_err("Failed to apply an action: %s\n", buf);
-       }
+       if (IS_ENABLED(CONFIG_HIST_TRIGGERS)) {
+               xbc_node_for_each_array_value(enode, "actions", anode, p) {
+                       if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf))
+                               pr_err("action string is too long: %s\n", p);
+                       else if (trigger_process_regex(file, buf) < 0)
+                               pr_err("Failed to apply an action: %s\n", buf);
+               }
+       } else if (xbc_node_find_value(enode, "actions", NULL))
+               pr_err("Failed to apply event actions because CONFIG_HIST_TRIGGERS is not set.\n");
 
        if (xbc_node_find_value(enode, "enable", NULL)) {
                if (trace_event_enable_disable(file, 1, 0) < 0)