> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index
> 151b8310ac70..d4c8aa2f4db7 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -415,8 +415,6 @@ struct cpu_topo {
> u32 thread_sib;
> char **core_siblings;
> char **thread_siblings;
> - int *core_id;
> - int *phy_pkg_id;
> };
>
> static int build_cpu_topo(struct cpu_topo *tp, int cpu) @@ -479,9 +477,6
> @@ try_threads:
> }
> ret = 0;
> done:
> - tp->core_id[cpu] = cpu_map__get_core_id(cpu);
> - tp->phy_pkg_id[cpu] = cpu_map__get_socket_id(cpu);
> -
> if(fp)
> fclose(fp);
> free(buf);
> @@ -509,7 +504,7 @@ static struct cpu_topo *build_cpu_topology(void)
> struct cpu_topo *tp;
> void *addr;
> u32 nr, i;
> - size_t sz, sz_id;
> + size_t sz;
> long ncpus;
> int ret = -1;
>
> @@ -520,9 +515,8 @@ static struct cpu_topo *build_cpu_topology(void)
> nr = (u32)(ncpus & UINT_MAX);
>
> sz = nr * sizeof(char *);
> - sz_id = nr * sizeof(int);
>
> - addr = calloc(1, sizeof(*tp) + 2 * sz + 2 * sz_id);
> + addr = calloc(1, sizeof(*tp) + 2 * sz);
> if (!addr)
> return NULL;
>
> @@ -532,10 +526,6 @@ static struct cpu_topo *build_cpu_topology(void)
> tp->core_siblings = addr;
> addr += sz;
> tp->thread_siblings = addr;
> - addr += sz;
> - tp->core_id = addr;
> - addr += sz_id;
> - tp->phy_pkg_id = addr;
>
> for (i = 0; i < nr; i++) {
> ret = build_cpu_topo(tp, i);
> @@ -554,7 +544,7 @@ static int write_cpu_topology(int fd, struct
> perf_header *h __maybe_unused, {
> struct cpu_topo *tp;
> u32 i;
> - int ret;
> + int ret, j;
>
> tp = build_cpu_topology();
> if (!tp)
> @@ -579,11 +569,15 @@ static int write_cpu_topology(int fd, struct
> perf_header *h __maybe_unused,
> break;
> }
>
> - for (i = 0; i < tp->cpu_nr; i++) {
> - ret = do_write(fd, &tp->core_id[i], sizeof(int));
> + perf_env__read_cpu_topology_map(&perf_env);
> +
I think we need to handle error here.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
