diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-10 10:16:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-10 10:16:13 +0100 |
| commit | ff05cdd619ab422b5380f56d19603bc51aca97a5 (patch) | |
| tree | 0ba81a5237c1a85a8e20c2c623c83978529a0d73 /tools | |
| parent | 82eacc8a7bb8eb5809ef9ad8fae8104110626305 (diff) | |
| parent | fdf53713aebb1e8ccbfcadade2b8449e62394547 (diff) | |
Merge tag 'v4.4.155' into linux-linaro-lsk-v4.4
This is the 4.4.155 stable release
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/auxtrace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 67551225764e..5053fac29f05 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -187,6 +187,9 @@ static int auxtrace_queues__grow(struct auxtrace_queues *queues, for (i = 0; i < queues->nr_queues; i++) { list_splice_tail(&queues->queue_array[i].head, &queue_array[i].head); + queue_array[i].tid = queues->queue_array[i].tid; + queue_array[i].cpu = queues->queue_array[i].cpu; + queue_array[i].set = queues->queue_array[i].set; queue_array[i].priv = queues->queue_array[i].priv; } |