diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-07-21 08:57:44 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 08:57:44 +0300 |
commit | f6a74a5e15df32f289837feeabf8c84829312b06 (patch) | |
tree | c8d16b12ef76c7a9e21693d1bad31f59f78436cd /tools/perf/util/thread_map.c | |
parent | 60cd37eb100c4880b28078a47f3062fac7572095 (diff) | |
parent | 9d634c410b07be7bf637ea03362d3ff132088fe3 (diff) | |
download | linux-f6a74a5e15df32f289837feeabf8c84829312b06.tar.xz |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/thread_map.c')
-rw-r--r-- | tools/perf/util/thread_map.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c index da7646d767fe..292ae2c90e06 100644 --- a/tools/perf/util/thread_map.c +++ b/tools/perf/util/thread_map.c @@ -136,8 +136,7 @@ struct thread_map *thread_map__new_by_uid(uid_t uid) if (grow) { struct thread_map *tmp; - tmp = realloc(threads, (sizeof(*threads) + - max_threads * sizeof(pid_t))); + tmp = thread_map__realloc(threads, max_threads); if (tmp == NULL) goto out_free_namelist; |