tracing: Add support for dynamic strings to synthetic events

[linux-2.6-microblaze.git] / kernel / trace / trace_events_hist.c

diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 812bc5f..c74a7d1 100644 (file)
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -3289,6 +3289,15 @@ static int check_synth_field(struct synth_event *event,
 
        field = event->fields[field_pos];
 
+       /*
+        * A dynamic string synth field can accept static or
+        * dynamic. A static string synth field can only accept a
+        * same-sized static string, which is checked for later.
+        */
+       if (strstr(hist_field->type, "char[") && field->is_string
+           && field->is_dynamic)
+               return 0;
+
        if (strcmp(field->type, hist_field->type) != 0) {
                if (field->size != hist_field->size ||
                    field->is_signed != hist_field->is_signed)