projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v5.14-rc3 into usb-next
[linux-2.6-microblaze.git]
/
kernel
/
trace
/
trace_events_synth.c
diff --git
a/kernel/trace/trace_events_synth.c
b/kernel/trace/trace_events_synth.c
index
2ac75eb
..
9315fc0
100644
(file)
--- a/
kernel/trace/trace_events_synth.c
+++ b/
kernel/trace/trace_events_synth.c
@@
-893,15
+893,13
@@
static struct synth_event *alloc_synth_event(const char *name, int n_fields,
dyn_event_init(&event->devent, &synth_event_ops);
for (i = 0, j = 0; i < n_fields; i++) {
dyn_event_init(&event->devent, &synth_event_ops);
for (i = 0, j = 0; i < n_fields; i++) {
+ fields[i]->field_pos = i;
event->fields[i] = fields[i];
event->fields[i] = fields[i];
- if (fields[i]->is_dynamic) {
- event->dynamic_fields[j] = fields[i];
- event->dynamic_fields[j]->field_pos = i;
+ if (fields[i]->is_dynamic)
event->dynamic_fields[j++] = fields[i];
event->dynamic_fields[j++] = fields[i];
- event->n_dynamic_fields++;
- }
}
}
+ event->n_dynamic_fields = j;
event->n_fields = n_fields;
out:
return event;
event->n_fields = n_fields;
out:
return event;